diff options
| author | Lars Ingebrigtsen <larsi@gnus.org> | 2017-09-13 20:10:51 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen <larsi@gnus.org> | 2017-09-13 20:11:02 +0200 |
| commit | 63398071471f6cd6b006d3c35d2d83c597549e4a (patch) | |
| tree | 2bfcc3ed4f1770dc1a5312b04a63082632f53fb2 /lisp/url/url-gw.el | |
| parent | 4ab44f75d6ad7eb378c85c111ea1006076cf994b (diff) | |
| download | emacs-63398071471f6cd6b006d3c35d2d83c597549e4a.tar.gz emacs-63398071471f6cd6b006d3c35d2d83c597549e4a.tar.bz2 emacs-63398071471f6cd6b006d3c35d2d83c597549e4a.zip | |
Make gnutls-verify-error work again with url-retrieve-synchronously
* lisp/url/url-gw.el (url-open-stream): Only use :nowait if
we're doing async connections (bug#26835).
* lisp/url/url-parse.el (url): Add an asynchronous slot.
* lisp/url/url.el (url-asynchronous): New variable.
(url-retrieve-internal): Store the value.
(url-retrieve-synchronously): Bind the variable.
Diffstat (limited to 'lisp/url/url-gw.el')
| -rw-r--r-- | lisp/url/url-gw.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/url/url-gw.el b/lisp/url/url-gw.el index 28acde64203..716b7c0a6e0 100644 --- a/lisp/url/url-gw.el +++ b/lisp/url/url-gw.el @@ -24,6 +24,7 @@ ;;; Code: (require 'url-vars) +(require 'url-parse) ;; Fixme: support SSH explicitly or via a url-gateway-rlogin-program? @@ -245,8 +246,9 @@ overriding the value of `url-gateway-method'." name buffer host service :type gw-method ;; Use non-blocking socket if we can. - :nowait (featurep 'make-network-process - '(:nowait t)))) + :nowait (and (featurep 'make-network-process) + (url-asynchronous url-current-object) + '(:nowait t)))) (`socks (socks-open-network-stream name buffer host service)) (`telnet |