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)))