summaryrefslogtreecommitdiff
path: root/lisp/url/url-http.el
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@linux-m68k.org>2018-06-29 17:24:31 +0200
committerAndreas Schwab <schwab@linux-m68k.org>2018-06-29 17:25:37 +0200
commit84613dae5c34ea742dd9a3e56f5acb55f604b483 (patch)
treea6188f09e4945a06fd09052b18cf020e390657a6 /lisp/url/url-http.el
parent45390596e6d59e14c8f9c0596aeb4f4141d0c1e8 (diff)
downloademacs-84613dae5c34ea742dd9a3e56f5acb55f604b483.tar.gz
emacs-84613dae5c34ea742dd9a3e56f5acb55f604b483.tar.bz2
emacs-84613dae5c34ea742dd9a3e56f5acb55f604b483.zip
Use a non-proxy request when retrieving https URLs via a proxy
* lisp/url/url-http.el (url-https-proxy-after-change-function): Bind url-http-proxy to nil around url-http-create-request.
Diffstat (limited to 'lisp/url/url-http.el')
-rw-r--r--lisp/url/url-http.el4
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index 53798f77c39..817c5ce3b3d 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -1412,7 +1412,9 @@ The return value of this function is the retrieval buffer."
'url-http-wait-for-headers-change-function)
(set-process-filter tls-connection 'url-http-generic-filter)
(process-send-string tls-connection
- (url-http-create-request)))
+ ;; Use the non-proxy form of the request
+ (let (url-http-proxy)
+ (url-http-create-request))))
(gnutls-error
(url-http-activate-callback)
(error "gnutls-error: %s" e))