aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen2010-10-04 21:05:53 +0200
committerLars Magne Ingebrigtsen2010-10-04 21:05:53 +0200
commit697ebdb06b70c96e79b844216c305c3ec2eb7f07 (patch)
tree6f14fe3861c3bab4d5ab427c3254fc269808b368
parent51b403bdcb9af76833a11a668cc9be0f49d62e72 (diff)
downloademacs-697ebdb06b70c96e79b844216c305c3ec2eb7f07.tar.gz
emacs-697ebdb06b70c96e79b844216c305c3ec2eb7f07.zip
* url-http.el (url-http-wait-for-headers-change-function): Protect
against url-http-response-status for degenerate documents.
-rw-r--r--lisp/url/ChangeLog5
-rw-r--r--lisp/url/url-http.el3
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 @@
12010-10-04 Lars Magne Ingebrigtsen <larsi@gnus.org>
2
3 * url-http.el (url-http-wait-for-headers-change-function): Protect
4 against url-http-response-status for degenerate documents.
5
12010-10-03 Glenn Morris <rgm@gnu.org> 62010-10-03 Glenn Morris <rgm@gnu.org>
2 7
3 * url-util.el (url-get-url-filename-chars): Don't eval-and-compile. 8 * 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."
1054 end-of-headers t) 1054 end-of-headers t)
1055 (url-http-clean-headers))) 1055 (url-http-clean-headers)))
1056 1056
1057 (if (not end-of-headers) 1057 (if (or (not end-of-headers)
1058 (not url-http-response-status))
1058 ;; Haven't seen the end of the headers yet, need to wait 1059 ;; Haven't seen the end of the headers yet, need to wait
1059 ;; for more data to arrive. 1060 ;; for more data to arrive.
1060 nil 1061 nil