diff options
| author | Lars Magne Ingebrigtsen | 2010-10-07 13:40:42 +0200 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen | 2010-10-07 13:40:42 +0200 |
| commit | b0e0b216e540ffcde8a0ec8f0c572bb90c464eb9 (patch) | |
| tree | 5aae667fa38e2c1f7358593252747d5f0c5afd8c | |
| parent | 29c72a6e4382d33779f7706719cb784ee4c4ef88 (diff) | |
| download | emacs-b0e0b216e540ffcde8a0ec8f0c572bb90c464eb9.tar.gz emacs-b0e0b216e540ffcde8a0ec8f0c572bb90c464eb9.zip | |
url-http.el (url-http-end-of-document-sentinel): Protect against the
process buffer being killed.
| -rw-r--r-- | lisp/url/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/url/url-http.el | 15 |
2 files changed, 13 insertions, 7 deletions
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog index 37a635e9906..4c4af45b1c2 100644 --- a/lisp/url/ChangeLog +++ b/lisp/url/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2010-10-07 Lars Magne Ingebrigtsen <larsi@gnus.org> | ||
| 2 | |||
| 3 | * url-http.el (url-http-end-of-document-sentinel): Protect against | ||
| 4 | the process buffer being killed. | ||
| 5 | |||
| 1 | 2010-10-04 Lars Magne Ingebrigtsen <larsi@gnus.org> | 6 | 2010-10-04 Lars Magne Ingebrigtsen <larsi@gnus.org> |
| 2 | 7 | ||
| 3 | * url-http.el (url-http-wait-for-headers-change-function): Protect | 8 | * url-http.el (url-http-wait-for-headers-change-function): Protect |
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el index 1c9c8c8a3de..9bfb6df1d42 100644 --- a/lisp/url/url-http.el +++ b/lisp/url/url-http.el | |||
| @@ -874,13 +874,14 @@ should be shown to the user." | |||
| 874 | (url-http-debug "url-http-end-of-document-sentinel in buffer (%s)" | 874 | (url-http-debug "url-http-end-of-document-sentinel in buffer (%s)" |
| 875 | (process-buffer proc)) | 875 | (process-buffer proc)) |
| 876 | (url-http-idle-sentinel proc why) | 876 | (url-http-idle-sentinel proc why) |
| 877 | (with-current-buffer (process-buffer proc) | 877 | (when (buffer-name (process-buffer proc)) |
| 878 | (goto-char (point-min)) | 878 | (with-current-buffer (process-buffer proc) |
| 879 | (if (not (looking-at "HTTP/")) | 879 | (goto-char (point-min)) |
| 880 | ;; HTTP/0.9 just gets passed back no matter what | 880 | (if (not (looking-at "HTTP/")) |
| 881 | (url-http-activate-callback) | 881 | ;; HTTP/0.9 just gets passed back no matter what |
| 882 | (if (url-http-parse-headers) | 882 | (url-http-activate-callback) |
| 883 | (url-http-activate-callback))))) | 883 | (if (url-http-parse-headers) |
| 884 | (url-http-activate-callback)))))) | ||
| 884 | 885 | ||
| 885 | (defun url-http-simple-after-change-function (st nd length) | 886 | (defun url-http-simple-after-change-function (st nd length) |
| 886 | ;; Function used when we do NOT know how long the document is going to be | 887 | ;; Function used when we do NOT know how long the document is going to be |