summaryrefslogtreecommitdiff
path: root/lisp/url/url-http.el
diff options
context:
space:
mode:
authorTakafumi Arakaki <aka.tkf@gmail.com>2012-12-22 10:59:08 +0800
committerChong Yidong <cyd@gnu.org>2012-12-22 10:59:08 +0800
commit33d359875ab09abce0752e1502b8891f03fe9743 (patch)
tree3e82262c039920fd5e5aa01695b74542c147f558 /lisp/url/url-http.el
parentc545e313b55b8efd1565f1ee50164026134a73dc (diff)
downloademacs-33d359875ab09abce0752e1502b8891f03fe9743.tar.gz
emacs-33d359875ab09abce0752e1502b8891f03fe9743.tar.bz2
emacs-33d359875ab09abce0752e1502b8891f03fe9743.zip
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. Fixes: debbugs:11469 debbugs:12374
Diffstat (limited to 'lisp/url/url-http.el')
-rw-r--r--lisp/url/url-http.el7
1 files changed, 5 insertions, 2 deletions
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index 73d53e08c59..1f705f6a0f9 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -890,8 +890,11 @@ should be shown to the user."
(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))))))