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-parse.el | |
| parent | c545e313b55b8efd1565f1ee50164026134a73dc (diff) | |
| download | emacs-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-parse.el')
| -rw-r--r-- | lisp/url/url-parse.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/url/url-parse.el b/lisp/url/url-parse.el index 2efabed5cd8..b196fbb1531 100644 --- a/lisp/url/url-parse.el +++ b/lisp/url/url-parse.el @@ -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 |