aboutsummaryrefslogtreecommitdiffstats
path: root/src/process.h
diff options
context:
space:
mode:
authorLars Ingebrigtsen2016-01-31 02:32:21 +0100
committerLars Ingebrigtsen2016-01-31 02:32:21 +0100
commitcecf6c9ac58ecd9ea251241a6b8a18e0e01dbc2a (patch)
tree3aeb6ebaa3f1418f48a99502107f1dae2703dd11 /src/process.h
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 'src/process.h')
-rw-r--r--src/process.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/process.h b/src/process.h
index 8bd555b83bd..eb34f5f0411 100644
--- a/src/process.h
+++ b/src/process.h
@@ -191,8 +191,8 @@ struct Lisp_Process
191 unsigned int gnutls_extra_peer_verification; 191 unsigned int gnutls_extra_peer_verification;
192 int gnutls_log_level; 192 int gnutls_log_level;
193 int gnutls_handshakes_tried; 193 int gnutls_handshakes_tried;
194 Lisp_Object gnutls_async_parameters;
194 bool_bf gnutls_p : 1; 195 bool_bf gnutls_p : 1;
195 bool_bf gnutls_wait_p : 1;
196#endif 196#endif
197}; 197};
198 198