2 files changed, 7 insertions, 1 deletions

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index f50808ff8dd..720f682d225 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-04  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * url-http.el (url-http-wait-for-headers-change-function): Protect
+        against url-http-response-status for degenerate documents.
+
 2010-10-03  Glenn Morris  <rgm@gnu.org>
 
         * url-util.el (url-get-url-filename-chars): Don't eval-and-compile.
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index 1c9c8c8a3de..71de213b64b 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -1054,7 +1054,8 @@ the end of the document."
                 end-of-headers t)
           (url-http-clean-headers)))
 
-      (if (not end-of-headers)
+      (if (or (not end-of-headers)
+              (not url-http-response-status))
           ;; Haven't seen the end of the headers yet, need to wait
           ;; for more data to arrive.
           nil