[Emacs-diffs] /srv/bzr/emacs/trunk r106369: If the server hangs up while we're talking to it, just `message' the error instead of throwing an error.

[Lars Magne Ingebrigtsen]

------------------------------------------------------------
revno: 106369
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Mon 2011-11-14 17:09:13 +0100
message:
  If the server hangs up while we're talking to it, just `message' the error 
instead of throwing an error.
modified:
  lisp/url/ChangeLog
  lisp/url/url-http.el

=== modified file 'lisp/url/ChangeLog'
--- a/lisp/url/ChangeLog        2011-11-03 21:53:59 +0000
+++ b/lisp/url/ChangeLog        2011-11-14 16:09:13 +0000
@@ -1,3 +1,9 @@
+2011-11-14  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * url-http.el (url-http-async-sentinel): If the server hangs up
+       while we're talking to it, just `message' the error instead of
+       throwing an error.
+
 2011-11-03  Lars Magne Ingebrigtsen  <address@hidden>
 
        * url-cookie.el (url-cookie-expired-p): Protect against

=== modified file 'lisp/url/url-http.el'
--- a/lisp/url/url-http.el      2011-11-09 06:10:51 +0000
+++ b/lisp/url/url-http.el      2011-11-14 16:09:13 +0000
@@ -1255,7 +1255,11 @@
        (url-http-end-of-document-sentinel proc why))
        ((string= (substring why 0 4) "open")
        (setq url-http-connection-opened t)
-       (process-send-string proc (url-http-create-request)))
+       (condition-case error
+           (process-send-string proc (url-http-create-request))
+         (file-error
+          (setq url-http-connection-opened nil)
+          (message "HTTP error: %s" error))))
        (t
        (setf (car url-callback-arguments)
              (nconc (list :error (list 'error 'connection-failed why