2 files changed, 10 insertions, 0 deletions

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 5714179fcfe..8ad0a8ee43f 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,9 @@
+2011-09-13  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * url-http.el (url-http-find-free-connection): If there was an
+        error on connect, make sure the user isn't bothered with
+        irrelevant questions.
+
 2011-08-07  Chong Yidong  <cyd@stupidchicken.com>
 
         * url-http.el (url-http-parse-headers): For HTTP 301/302/307,
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index a21aed21436..0ba3aa2c5fe 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -180,6 +180,10 @@ request.")
                    ;; Drop the temp buffer link before killing the buffer.
                    (set-process-buffer proc nil))
                  proc)
+             ;; If there was an error on connect, make sure we don't
+             ;; get queried.
+             (when (get-buffer-process buf)
+               (set-process-query-on-exit-flag (get-buffer-process buf) nil))
              (kill-buffer buf)))))))
 
 ;; Building an HTTP request