diff options
| author | Thomas Fitzsimmons <fitzsim@fitzsim.org> | 2019-08-15 23:12:50 -0400 |
|---|---|---|
| committer | Thomas Fitzsimmons <fitzsim@fitzsim.org> | 2019-08-15 23:29:51 -0400 |
| commit | c02f3125cd6c1843731ab96f156c8ea24dcfe898 (patch) | |
| tree | 4bb1daf3765b5f6775b0499c4a930144d63a5c2c /lisp/url | |
| parent | 3393364b6b925ec6ad4b2570ed8ea5358170b312 (diff) | |
| download | emacs-c02f3125cd6c1843731ab96f156c8ea24dcfe898.tar.gz | |
Do not recreate full URL for proxied HTTPS requests (Bug#35969)
* lisp/url/url-http.el (url-http-create-request): Do not recreate
full URL for proxied HTTPS requests.
(url-https-proxy-after-change-function): Do not bind
url-http-proxy to nil before calling url-http-create-request.
(Bug#35969)
Diffstat (limited to 'lisp/url')
| -rw-r--r-- | lisp/url/url-http.el | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el index 94d1ba9668b..bfc106c2a5c 100644 --- a/lisp/url/url-http.el +++ b/lisp/url/url-http.el @@ -329,7 +329,10 @@ Use `url-http-referer' as the Referer-header (subject to `url-privacy-level')." ;; The request (or url-http-method "GET") " " (url-http--encode-string - (if using-proxy (url-recreate-url url-http-target-url) real-fname)) + (if (and using-proxy + ;; Bug#35969. + (not (equal "https" (url-type url-http-target-url)))) + (url-recreate-url url-http-target-url) real-fname)) " HTTP/" url-http-version "\r\n" ;; Version of MIME we speak "MIME-Version: 1.0\r\n" @@ -1439,9 +1442,7 @@ 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 - ;; Use the non-proxy form of the request - (let (url-http-proxy) - (url-http-create-request)))) + (url-http-create-request))) (gnutls-error (url-http-activate-callback) (error "gnutls-error: %s" e)) |