[Emacs-diffs] emacs/lisp/url ChangeLog url-http.el

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/11/08 05:32:48

Modified files:
        lisp/url       : ChangeLog url-http.el 

Log message:
        * url-http.el (url-http-handle-authentication): Use proxy server,
        if any, for authentication (Bug#4883).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/url/ChangeLog?cvsroot=emacs&r1=1.186&r2=1.187
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/url/url-http.el?cvsroot=emacs&r1=1.64&r2=1.65

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/url/ChangeLog,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -b -r1.186 -r1.187
--- ChangeLog   3 Nov 2009 02:04:35 -0000       1.186
+++ ChangeLog   8 Nov 2009 05:32:48 -0000       1.187
@@ -1,3 +1,8 @@
+2009-11-08  Kai Tetzlaff  <address@hidden>  (tiny change)
+
+       * url-http.el (url-http-handle-authentication): Use proxy server,
+       if any, for authentication (Bug#4883).
+
 2009-11-03  Stefan Monnier  <address@hidden>
 
        * url-util.el (url-insert-entities-in-string):

Index: url-http.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/url/url-http.el,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- url-http.el 1 Oct 2009 02:06:55 -0000       1.64
+++ url-http.el 8 Nov 2009 05:32:48 -0000       1.65
@@ -315,12 +315,16 @@
                  '("basic")))
        (type nil)
        (url (url-recreate-url url-current-object))
-       (url-basic-auth-storage 'url-http-real-basic-auth-storage)
+       (auth-url (url-recreate-url
+                  (if (and proxy (boundp 'url-http-proxy))
+                      url-http-proxy
+                    url-current-object)))
+       (url-basic-auth-storage (if proxy
+                                   ;; Cheating, but who cares? :)
+                                   'url-http-proxy-basic-auth-storage
+                                 'url-http-real-basic-auth-storage))
        auth
        (strength 0))
-    ;; Cheating, but who cares? :)
-    (if proxy
-       (setq url-basic-auth-storage 'url-http-proxy-basic-auth-storage))
 
     ;; find strongest supported auth
     (dolist (this-auth auths)
@@ -347,7 +351,8 @@
                  " send it to " url-bug-address ".<hr>")
          (setq status t))
       (let* ((args (url-parse-args (subst-char-in-string ?, ?\; auth)))
-            (auth (url-get-authentication url (cdr-safe (assoc "realm" args))
+            (auth (url-get-authentication auth-url
+                                          (cdr-safe (assoc "realm" args))
                                           type t args)))
        (if (not auth)
            (setq success t)