diff options
| author | Takafumi Arakaki <aka.tkf@gmail.com> | 2012-12-22 10:59:08 +0800 |
|---|---|---|
| committer | Chong Yidong <cyd@gnu.org> | 2012-12-22 10:59:08 +0800 |
| commit | 33d359875ab09abce0752e1502b8891f03fe9743 (patch) | |
| tree | 3e82262c039920fd5e5aa01695b74542c147f558 /lisp/url/url-expand.el | |
| parent | c545e313b55b8efd1565f1ee50164026134a73dc (diff) | |
| download | emacs-33d359875ab09abce0752e1502b8891f03fe9743.tar.gz | |
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-expand.el')
| -rw-r--r-- | lisp/url/url-expand.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/url/url-expand.el b/lisp/url/url-expand.el index 4bf13f4abe3..8a6dc2b87d4 100644 --- a/lisp/url/url-expand.el +++ b/lisp/url/url-expand.el @@ -112,7 +112,7 @@ path components followed by `..' are removed, along with the `..' itself." ;; 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)))) |