aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/url
diff options
context:
space:
mode:
authorChong Yidong2006-11-10 17:09:01 +0000
committerChong Yidong2006-11-10 17:09:01 +0000
commitdb8d59365b5ccdca367ace2d4df5b8a2242e5765 (patch)
tree1807e8d7919ba091c45113f7012ff1de5cb70059 /lisp/url
parent8529c21d8ca254f34e9565912de092e2ff48c96e (diff)
downloademacs-db8d59365b5ccdca367ace2d4df5b8a2242e5765.tar.gz
emacs-db8d59365b5ccdca367ace2d4df5b8a2242e5765.zip
(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.
Diffstat (limited to 'lisp/url')
-rw-r--r--lisp/url/url-http.el6
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.")
92 92
93(defun url-http-mark-connection-as-free (host port proc) 93(defun url-http-mark-connection-as-free (host port proc)
94 (url-http-debug "Marking connection as free: %s:%d %S" host port proc) 94 (url-http-debug "Marking connection as free: %s:%d %S" host port proc)
95 (when (memq (process-status proc) '(open run)) 95 (when (memq (process-status proc) '(open run connect))
96 (set-process-buffer proc nil) 96 (set-process-buffer proc nil)
97 (set-process-sentinel proc 'url-http-idle-sentinel) 97 (set-process-sentinel proc 'url-http-idle-sentinel)
98 (puthash (cons host port) 98 (puthash (cons host port)
@@ -104,7 +104,7 @@ request.")
104 (let ((conns (gethash (cons host port) url-http-open-connections)) 104 (let ((conns (gethash (cons host port) url-http-open-connections))
105 (found nil)) 105 (found nil))
106 (while (and conns (not found)) 106 (while (and conns (not found))
107 (if (not (memq (process-status (car conns)) '(run open))) 107 (if (not (memq (process-status (car conns)) '(run open connect)))
108 (progn 108 (progn
109 (url-http-debug "Cleaning up dead process: %s:%d %S" 109 (url-http-debug "Cleaning up dead process: %s:%d %S"
110 host port (car conns)) 110 host port (car conns))
@@ -1144,7 +1144,7 @@ CBARGS as the arguments."
1144 (cond 1144 (cond
1145 ((string= (substring why 0 4) "open") 1145 ((string= (substring why 0 4) "open")
1146 (set-process-sentinel proc 'url-http-end-of-document-sentinel) 1146 (set-process-sentinel proc 'url-http-end-of-document-sentinel)
1147 (process-send-string proc (url-http-create-request url-current-object))) 1147 (process-send-string proc (url-http-create-request url-http-target-url)))
1148 (t 1148 (t
1149 (setf (car url-callback-arguments) 1149 (setf (car url-callback-arguments)
1150 (nconc (list :error (list 'error 'connection-failed why 1150 (nconc (list :error (list 'error 'connection-failed why