aboutsummaryrefslogtreecommitdiffstats
path: root/doc/misc
diff options
context:
space:
mode:
authorLars Ingebrigtsen2016-01-31 02:32:21 +0100
committerLars Ingebrigtsen2016-01-31 02:32:21 +0100
commitcecf6c9ac58ecd9ea251241a6b8a18e0e01dbc2a (patch)
tree3aeb6ebaa3f1418f48a99502107f1dae2703dd11 /doc/misc
parent1f71df7aacf15dbf242c74a4b7a7ac8fe0984a3c (diff)
downloademacs-cecf6c9ac58ecd9ea251241a6b8a18e0e01dbc2a.tar.gz
emacs-cecf6c9ac58ecd9ea251241a6b8a18e0e01dbc2a.zip
Rework the mechanisms for async GnuTLS connections
* lisp/net/gnutls.el (open-gnutls-stream): Compute the gnutls-boot parameters and pass them to the process object. (gnutls-negotiate): New parameter :return-keywords that won't connect to anything, just compute the keywords. * lisp/url/url-http.el (url-http): Revert async TLS sentinel hack, which is no longer necessary. * src/gnutls.c (Fgnutls_asynchronous_parameters): Rename from gnutls-mark-process. * src/process.c (connect_network_socket): If we're connecting to an asynchronous TLS socket, complete the GnuTLS boot sequence here. * src/process.h: New parameter gnutls_async_parameters.
Diffstat (limited to 'doc/misc')
-rw-r--r--doc/misc/emacs-gnutls.texi9
1 files changed, 6 insertions, 3 deletions
diff --git a/doc/misc/emacs-gnutls.texi b/doc/misc/emacs-gnutls.texi
index 1db6c517de8..75fd97c7c74 100644
--- a/doc/misc/emacs-gnutls.texi
+++ b/doc/misc/emacs-gnutls.texi
@@ -181,9 +181,6 @@ syntax are the same as those given to @code{open-network-stream}
181Manual}). The connection process is called @var{name} (made unique if 181Manual}). The connection process is called @var{name} (made unique if
182necessary). This function returns the connection process. 182necessary). This function returns the connection process.
183 183
184If called with @var{nowait}, the process is returned immediately
185(before connecting to the server).
186
187@lisp 184@lisp
188;; open a HTTPS connection 185;; open a HTTPS connection
189(open-gnutls-stream "tls" "tls-buffer" "yourserver.com" "https") 186(open-gnutls-stream "tls" "tls-buffer" "yourserver.com" "https")
@@ -194,6 +191,12 @@ If called with @var{nowait}, the process is returned immediately
194 191
195@end defun 192@end defun
196 193
194@findex gnutls-asynchronous-parameters
195If called with @var{nowait}, the process is returned immediately
196(before connecting to the server). In that case, the process object
197is told what parameters to use when negotiating the connection
198by using the @code{gnutls-asynchronous-parameters} function.
199
197The function @code{gnutls-negotiate} is not generally useful and it 200The function @code{gnutls-negotiate} is not generally useful and it
198may change as needed, so please see @file{gnutls.el} for the details. 201may change as needed, so please see @file{gnutls.el} for the details.
199 202