aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen2011-11-14 17:09:13 +0100
committerLars Magne Ingebrigtsen2011-11-14 17:09:13 +0100
commit122d94635f0a94b20ddb15c529fe1f5c7024fe05 (patch)
tree5b844568c466f5d7db704d14fba6980b71c731c9
parent40500957d93dfce9fa852791bd56a737e577f245 (diff)
downloademacs-122d94635f0a94b20ddb15c529fe1f5c7024fe05.tar.gz
emacs-122d94635f0a94b20ddb15c529fe1f5c7024fe05.zip
If the server hangs up while we're talking to it, just `message' the error instead of throwing an error.
-rw-r--r--lisp/url/ChangeLog6
-rw-r--r--lisp/url/url-http.el6
2 files changed, 11 insertions, 1 deletions
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index a2a1b451258..5eb22bb8614 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,9 @@
12011-11-14 Lars Magne Ingebrigtsen <larsi@gnus.org>
2
3 * url-http.el (url-http-async-sentinel): If the server hangs up
4 while we're talking to it, just `message' the error instead of
5 throwing an error.
6
12011-11-03 Lars Magne Ingebrigtsen <larsi@gnus.org> 72011-11-03 Lars Magne Ingebrigtsen <larsi@gnus.org>
2 8
3 * url-cookie.el (url-cookie-expired-p): Protect against 9 * url-cookie.el (url-cookie-expired-p): Protect against
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index 6e192cd5aae..e9da4a1010c 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -1255,7 +1255,11 @@ CBARGS as the arguments."
1255 (url-http-end-of-document-sentinel proc why)) 1255 (url-http-end-of-document-sentinel proc why))
1256 ((string= (substring why 0 4) "open") 1256 ((string= (substring why 0 4) "open")
1257 (setq url-http-connection-opened t) 1257 (setq url-http-connection-opened t)
1258 (process-send-string proc (url-http-create-request))) 1258 (condition-case error
1259 (process-send-string proc (url-http-create-request))
1260 (file-error
1261 (setq url-http-connection-opened nil)
1262 (message "HTTP error: %s" error))))
1259 (t 1263 (t
1260 (setf (car url-callback-arguments) 1264 (setf (car url-callback-arguments)
1261 (nconc (list :error (list 'error 'connection-failed why 1265 (nconc (list :error (list 'error 'connection-failed why