aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/url/url-http.el9
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')."
329 ;; The request 329 ;; The request
330 (or url-http-method "GET") " " 330 (or url-http-method "GET") " "
331 (url-http--encode-string 331 (url-http--encode-string
332 (if using-proxy (url-recreate-url url-http-target-url) real-fname)) 332 (if (and using-proxy
333 ;; Bug#35969.
334 (not (equal "https" (url-type url-http-target-url))))
335 (url-recreate-url url-http-target-url) real-fname))
333 " HTTP/" url-http-version "\r\n" 336 " HTTP/" url-http-version "\r\n"
334 ;; Version of MIME we speak 337 ;; Version of MIME we speak
335 "MIME-Version: 1.0\r\n" 338 "MIME-Version: 1.0\r\n"
@@ -1439,9 +1442,7 @@ The return value of this function is the retrieval buffer."
1439 'url-http-wait-for-headers-change-function) 1442 'url-http-wait-for-headers-change-function)
1440 (set-process-filter tls-connection 'url-http-generic-filter) 1443 (set-process-filter tls-connection 'url-http-generic-filter)
1441 (process-send-string tls-connection 1444 (process-send-string tls-connection
1442 ;; Use the non-proxy form of the request 1445 (url-http-create-request)))
1443 (let (url-http-proxy)
1444 (url-http-create-request))))
1445 (gnutls-error 1446 (gnutls-error
1446 (url-http-activate-callback) 1447 (url-http-activate-callback)
1447 (error "gnutls-error: %s" e)) 1448 (error "gnutls-error: %s" e))