diff options
| author | Magnus Henoch | 2006-10-12 19:59:58 +0000 |
|---|---|---|
| committer | Magnus Henoch | 2006-10-12 19:59:58 +0000 |
| commit | dfea17e083019b71fd5cb2ccb740b45232bf9fcd (patch) | |
| tree | e53f855a1bf81d2061c3dc3ff3b69270f78200f3 | |
| parent | 431feaf6f4fc6185343b1b74362bb5c4f9d8e49e (diff) | |
| download | emacs-dfea17e083019b71fd5cb2ccb740b45232bf9fcd.tar.gz emacs-dfea17e083019b71fd5cb2ccb740b45232bf9fcd.zip | |
(url-http-find-free-connection): Handle url-open-stream returning nil.
| -rw-r--r-- | lisp/url/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/url/url-http.el | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog index dae82b2b900..2aa14af8983 100644 --- a/lisp/url/ChangeLog +++ b/lisp/url/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2006-10-12 Magnus Henoch <mange@freemail.hu> | ||
| 2 | |||
| 3 | * url-http.el (url-http-find-free-connection): Handle | ||
| 4 | url-open-stream returning nil. | ||
| 5 | |||
| 1 | 2006-10-11 Magnus Henoch <mange@freemail.hu> | 6 | 2006-10-11 Magnus Henoch <mange@freemail.hu> |
| 2 | 7 | ||
| 3 | * url-https.el: Remove (clashes with url-http on 8+3 systems). | 8 | * url-https.el: Remove (clashes with url-http on 8+3 systems). |
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el index 3e74839dcb9..bf8069ded7e 100644 --- a/lisp/url/url-http.el +++ b/lisp/url/url-http.el | |||
| @@ -123,8 +123,10 @@ request.") | |||
| 123 | ;; like authentication. But we use another buffer afterwards. | 123 | ;; like authentication. But we use another buffer afterwards. |
| 124 | (unwind-protect | 124 | (unwind-protect |
| 125 | (let ((proc (url-open-stream host buf host port))) | 125 | (let ((proc (url-open-stream host buf host port))) |
| 126 | ;; Drop the temp buffer link before killing the buffer. | 126 | ;; url-open-stream might return nil. |
| 127 | (set-process-buffer proc nil) | 127 | (when (processp proc) |
| 128 | ;; Drop the temp buffer link before killing the buffer. | ||
| 129 | (set-process-buffer proc nil)) | ||
| 128 | proc) | 130 | proc) |
| 129 | (kill-buffer buf))))))) | 131 | (kill-buffer buf))))))) |
| 130 | 132 | ||