* lisp/url/url-http.el (url-http-create-request): Use url-http-proxy to

look up proxy credentials.

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index ae224f4102feaa1dd65306c76ab30dcdf77f6392..88e3e06089bf0efc84098d14c427b6ce195abd07 100644 (file)
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-11  Jason Rumney  <jasonr@gnu.org>
+
+       * url-http.el (url-http-create-request): Use url-http-proxy to
+       look up proxy credentials.
+
 2012-07-28  David Engster  <deng@randomsample.de>
 
        * url-dav.el (url-dav-supported-p): Added doc-string and remove

diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index 0b5ecc7bf988e532eb5176466f75fe49b17e469d..ac4bd365eca5843c075c026358491daea31a3cb7 100644 (file)
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -239,7 +239,7 @@ request.")
                         nil
                       (let ((url-basic-auth-storage
                              'url-http-proxy-basic-auth-storage))
-                        (url-get-authentication url-http-target-url nil 'any nil))))
+                        (url-get-authentication url-http-proxy nil 'any nil))))
         (real-fname (url-filename url-http-target-url))
         (host (url-host url-http-target-url))
         (auth (if (cdr-safe (assoc "Authorization" url-http-extra-headers))