summaryrefslogtreecommitdiff
path: root/lisp/url
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen <larsi@gnus.org>2011-07-03 15:08:40 +0200
committerLars Magne Ingebrigtsen <larsi@gnus.org>2011-07-03 15:08:40 +0200
commit9aec558af4588db021f494d80bb0cab2ae1f17c3 (patch)
treef840710729bb9385219ac0ad853322022e19af51 /lisp/url
parenta9ab721e7fdbedd15e520f74c9c90154a8c36669 (diff)
downloademacs-9aec558af4588db021f494d80bb0cab2ae1f17c3.tar.gz
* url-http.el (url-http-wait-for-headers-change-function): Remove
pointless "HTTP/0.9 How I hate thee!" message. Fixes: debbugs:6735
Diffstat (limited to 'lisp/url')
-rw-r--r--lisp/url/ChangeLog5
-rw-r--r--lisp/url/url-http.el23
2 files changed, 15 insertions, 13 deletions
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 9f7ad1c1ca5..27b23ac80bb 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-03 Lars Magne Ingebrigtsen <larsi@gnus.org>
+
+ * url-http.el (url-http-wait-for-headers-change-function): Remove
+ pointless "HTTP/0.9 How I hate thee!" message (bug#6735).
+
2011-06-04 Andreas Schwab <schwab@linux-m68k.org>
* url-future.el (url-future-test): Fix scope of `saver'.
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index 28071e7165a..78da8121722 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -1059,19 +1059,16 @@ the end of the document."
;; Haven't seen the end of the headers yet, need to wait
;; for more data to arrive.
nil
- (if old-http
- (message "HTTP/0.9 How I hate thee!")
- (progn
- (url-http-parse-response)
- (mail-narrow-to-head)
- ;;(narrow-to-region (point-min) url-http-end-of-headers)
- (setq url-http-transfer-encoding (mail-fetch-field
- "transfer-encoding")
- url-http-content-type (mail-fetch-field "content-type"))
- (if (mail-fetch-field "content-length")
- (setq url-http-content-length
- (string-to-number (mail-fetch-field "content-length"))))
- (widen)))
+ (unless old-http
+ (url-http-parse-response)
+ (mail-narrow-to-head)
+ (setq url-http-transfer-encoding (mail-fetch-field
+ "transfer-encoding")
+ url-http-content-type (mail-fetch-field "content-type"))
+ (if (mail-fetch-field "content-length")
+ (setq url-http-content-length
+ (string-to-number (mail-fetch-field "content-length"))))
+ (widen))
(when url-http-transfer-encoding
(setq url-http-transfer-encoding
(downcase url-http-transfer-encoding)))