aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2010-07-25 13:36:02 +0200
committerMichael Albinus2010-07-25 13:36:02 +0200
commit4ac3a65cf109e66549fea3d07202404ce4834ab6 (patch)
tree5261ca6da8bc74327dd2468d8d6a9f6c77061969
parentb196eafc464a413db482c61560369d6196896523 (diff)
downloademacs-4ac3a65cf109e66549fea3d07202404ce4834ab6.tar.gz
emacs-4ac3a65cf109e66549fea3d07202404ce4834ab6.zip
* url-http (url-http-parse-headers): Disable Tramp. (Bug#6717)
-rw-r--r--lisp/url/ChangeLog4
-rw-r--r--lisp/url/url-http.el5
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 790a7a9affa..8fe26f58833 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,7 @@
12010-07-25 Michael Albinus <michael.albinus@gmx.de>
2
3 * url-http (url-http-parse-headers): Disable Tramp. (Bug#6717)
4
12010-06-12 Štěpán Němec <stepnem@gmail.com> (tiny change) 52010-06-12 Štěpán Němec <stepnem@gmail.com> (tiny change)
2 6
3 * url-vars.el (url-privacy-level): Fix doc typo. (Bug#6406) 7 * url-vars.el (url-privacy-level): Fix doc typo. (Bug#6406)
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index 8c203c0eb87..b9aba9f37c9 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -435,7 +435,10 @@ should be shown to the user."
435 (delete-process url-http-process))))) 435 (delete-process url-http-process)))))
436 (let ((buffer (current-buffer)) 436 (let ((buffer (current-buffer))
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,
440 ;; see Bug#6717 for an example. We disable Tramp, therefore.
441 (tramp-mode nil))
439 (setq class (/ url-http-response-status 100)) 442 (setq class (/ url-http-response-status 100))
440 (url-http-debug "Parsed HTTP headers: class=%d status=%d" class url-http-response-status) 443 (url-http-debug "Parsed HTTP headers: class=%d status=%d" class url-http-response-status)
441 (url-http-handle-cookies) 444 (url-http-handle-cookies)