diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2006-11-10 17:09:01 +0000 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2006-11-10 17:09:01 +0000 |
| commit | db8d59365b5ccdca367ace2d4df5b8a2242e5765 (patch) | |
| tree | 1807e8d7919ba091c45113f7012ff1de5cb70059 | |
| parent | 8529c21d8ca254f34e9565912de092e2ff48c96e (diff) | |
| download | emacs-db8d59365b5ccdca367ace2d4df5b8a2242e5765.tar.gz | |
(url-http-mark-connection-as-free, url-http-find-free-connection):
Don't treat process with status `connect' as free.
(url-http-async-sentinel): Request correct url.
| -rw-r--r-- | lisp/url/url-http.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el index 68c54c249f5..2fb90058b51 100644 --- a/lisp/url/url-http.el +++ b/lisp/url/url-http.el @@ -92,7 +92,7 @@ request.") (defun url-http-mark-connection-as-free (host port proc) (url-http-debug "Marking connection as free: %s:%d %S" host port proc) - (when (memq (process-status proc) '(open run)) + (when (memq (process-status proc) '(open run connect)) (set-process-buffer proc nil) (set-process-sentinel proc 'url-http-idle-sentinel) (puthash (cons host port) @@ -104,7 +104,7 @@ request.") (let ((conns (gethash (cons host port) url-http-open-connections)) (found nil)) (while (and conns (not found)) - (if (not (memq (process-status (car conns)) '(run open))) + (if (not (memq (process-status (car conns)) '(run open connect))) (progn (url-http-debug "Cleaning up dead process: %s:%d %S" host port (car conns)) @@ -1144,7 +1144,7 @@ CBARGS as the arguments." (cond ((string= (substring why 0 4) "open") (set-process-sentinel proc 'url-http-end-of-document-sentinel) - (process-send-string proc (url-http-create-request url-current-object))) + (process-send-string proc (url-http-create-request url-http-target-url))) (t (setf (car url-callback-arguments) (nconc (list :error (list 'error 'connection-failed why |