[Emacs-diffs] /srv/bzr/emacs/trunk r111291: Two fixes for the URL library (tiny change).

[Chong Yidong]

------------------------------------------------------------
revno: 111291
fixes bugs: http://debbugs.gnu.org/11469 http://debbugs.gnu.org/12374
author: Takafumi Arakaki <address@hidden>
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sat 2012-12-22 10:59:08 +0800
message:
  Two fixes for the URL library (tiny change).
  
  * url-expand.el (url-default-expander): Don't calculate a default
  url port before checking url-type.
  
  * url-http.el (url-http-end-of-document-sentinel): Bind relevant
  url-request-* variables around the call to url-http.
modified:
  lisp/url/ChangeLog
  lisp/url/url-expand.el
  lisp/url/url-http.el
  lisp/url/url-parse.el

=== modified file 'lisp/url/ChangeLog'
--- a/lisp/url/ChangeLog        2012-12-03 06:23:06 +0000
+++ b/lisp/url/ChangeLog        2012-12-22 02:59:08 +0000
@@ -1,3 +1,15 @@
+2012-12-22  Takafumi Arakaki  <address@hidden>  (tiny change)
+
+       * url-http.el (url-http-end-of-document-sentinel): Bind relevant
+       url-request-* variables around the call to url-http (Bug#11469).
+
+       * url-expand.el (url-default-expander): Don't calculate a default
+       url port before checking url-type (Bug#12374).
+
+2012-12-22  Chong Yidong  <address@hidden>
+
+       * url-parse.el (url-port): Doc fix.
+
 2012-12-03  Chong Yidong  <address@hidden>
 
        * url-misc.el (url-do-terminal-emulator): Use make-term instead of

=== modified file 'lisp/url/url-expand.el'
--- a/lisp/url/url-expand.el    2012-07-11 23:13:41 +0000
+++ b/lisp/url/url-expand.el    2012-12-22 02:59:08 +0000
@@ -112,7 +112,7 @@
       ;; Well, they told us the scheme, let's just go with it.
       nil
     (setf (url-type urlobj) (or (url-type urlobj) (url-type defobj)))
-    (setf (url-port urlobj) (or (url-port urlobj)
+    (setf (url-port urlobj) (or (url-portspec urlobj)
                                 (and (string= (url-type urlobj)
                                               (url-type defobj))
                                     (url-port defobj))))

=== modified file 'lisp/url/url-http.el'
--- a/lisp/url/url-http.el      2012-10-13 09:37:25 +0000
+++ b/lisp/url/url-http.el      2012-12-22 02:59:08 +0000
@@ -890,8 +890,11 @@
                 (url-http-activate-callback)
               ;; Call `url-http' again if our connection expired.
               (erase-buffer)
-              (url-http url-current-object url-callback-function
-                        url-callback-arguments (current-buffer))))
+               (let ((url-request-method url-http-method)
+                     (url-request-extra-headers url-http-extra-headers)
+                     (url-request-data url-http-data))
+                 (url-http url-current-object url-callback-function
+                           url-callback-arguments (current-buffer)))))
            ((url-http-parse-headers)
             (url-http-activate-callback))))))
 

=== modified file 'lisp/url/url-parse.el'
--- a/lisp/url/url-parse.el     2012-11-17 06:48:51 +0000
+++ b/lisp/url/url-parse.el     2012-12-22 02:59:08 +0000
@@ -39,13 +39,14 @@
   silent (use-cookies t))
 
 (defsubst url-port (urlobj)
-  "Return the port number for the URL specified by URLOBJ."
+  "Return the port number for the URL specified by URLOBJ.
+If the port spec is nil (i.e. URLOBJ specifies no port number),
+return the default port number for URLOBJ's scheme."
   (declare (gv-setter (lambda (port) `(setf (url-portspec ,urlobj) ,port))))
   (or (url-portspec urlobj)
       (if (url-type urlobj)
           (url-scheme-get-property (url-type urlobj) 'default-port))))
 
-
 (defun url-path-and-query (urlobj)
   "Return the path and query components of URLOBJ.
 These two components are stored together in the FILENAME slot of