diff options
| author | Lars Ingebrigtsen <larsi@gnus.org> | 2016-01-31 01:34:45 +0100 |
|---|---|---|
| committer | Lars Ingebrigtsen <larsi@gnus.org> | 2016-01-31 01:34:45 +0100 |
| commit | 0f47153b97ae31b82366a857ec2f937c1580b637 (patch) | |
| tree | a5e3bbc672c6d3f0ddcf11ae8c648eafa1a847e8 /lisp/net/network-stream.el | |
| parent | cc45809152ab596deb2115369116e573d43c219a (diff) | |
| download | emacs-0f47153b97ae31b82366a857ec2f937c1580b637.tar.gz | |
Implement asynchronous GnuTLS connections
* doc/misc/emacs-gnutls.texi (Help For Developers): Mention
the nowait parameter.
* lisp/net/gnutls.el (open-gnutls-stream): Allow asynchronous
connections with the new nowait parameter.
* lisp/net/network-stream.el (network-stream-open-tls): Pass
on :nowait to open-gnutls-stream.
* lisp/url/url-http.el (url-http): Don't overwrite the
sentinel created by open-gnutls-stream.
* src/gnutls.c (Fgnutls_mark_process): New function.
* src/process.c (send_process): Don't write to GnuTLS sockets that
haven't been initialised yed.
* src/process.h: New slot gnutls_wait_p.
Diffstat (limited to 'lisp/net/network-stream.el')
| -rw-r--r-- | lisp/net/network-stream.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/net/network-stream.el b/lisp/net/network-stream.el index 59ac2995c05..02af8845bf0 100644 --- a/lisp/net/network-stream.el +++ b/lisp/net/network-stream.el @@ -359,10 +359,10 @@ asynchronously, if possible." (with-current-buffer buffer (let* ((start (point-max)) (stream - (funcall (if (gnutls-available-p) - 'open-gnutls-stream - 'open-tls-stream) - name buffer host service)) + (if (gnutls-available-p) + (open-gnutls-stream name buffer host service + (plist-get parameters :nowait)) + (open-tls-stream name buffer host service))) (eoc (plist-get parameters :end-of-command))) ;; Check certificate validity etc. (when (and (gnutls-available-p) stream) |