aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2010-07-26 15:19:32 +0200
committerMichael Albinus2010-07-26 15:19:32 +0200
commitc48763bb7905a61e2fbd55db105b076fd4a06588 (patch)
tree40fc12fe312123fe703fddd25d1dd06e99d74d60
parenta2a0d36b5b01118f36ce52c198148fbe308878fe (diff)
downloademacs-c48763bb7905a61e2fbd55db105b076fd4a06588.tar.gz
emacs-c48763bb7905a61e2fbd55db105b076fd4a06588.zip
* url-http (url-http-parse-headers): Disable file name handlers at
all (not only Tramp). (Bug#6717)
-rw-r--r--lisp/url/ChangeLog5
-rw-r--r--lisp/url/url-http.el5
2 files changed, 8 insertions, 2 deletions
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 8fe26f58833..f7babefc876 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,8 @@
12010-07-26 Michael Albinus <michael.albinus@gmx.de>
2
3 * url-http (url-http-parse-headers): Disable file name handlers at
4 all (not only Tramp). (Bug#6717)
5
12010-07-25 Michael Albinus <michael.albinus@gmx.de> 62010-07-25 Michael Albinus <michael.albinus@gmx.de>
2 7
3 * url-http (url-http-parse-headers): Disable Tramp. (Bug#6717) 8 * url-http (url-http-parse-headers): Disable Tramp. (Bug#6717)
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index b9aba9f37c9..00cfa46ea18 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -437,8 +437,9 @@ should be shown to the user."
437 (class nil) 437 (class nil)
438 (success nil) 438 (success nil)
439 ;; The filename part of a URL could be in remote file syntax, 439 ;; The filename part of a URL could be in remote file syntax,
440 ;; see Bug#6717 for an example. We disable Tramp, therefore. 440 ;; see Bug#6717 for an example. We disable file name
441 (tramp-mode nil)) 441 ;; handlers, therefore.
442 (file-name-handler-alist nil))
442 (setq class (/ url-http-response-status 100)) 443 (setq class (/ url-http-response-status 100))
443 (url-http-debug "Parsed HTTP headers: class=%d status=%d" class url-http-response-status) 444 (url-http-debug "Parsed HTTP headers: class=%d status=%d" class url-http-response-status)
444 (url-http-handle-cookies) 445 (url-http-handle-cookies)