Mercurial > emacs

changeset 73905:efe611a754cc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(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.
author Chong Yidong <cyd@stupidchicken.com>
date Fri, 10 Nov 2006 17:09:01 +0000
parents fe0e3c5e9303
children 22d4fdb9b8db
files lisp/url/url-http.el
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/url/url-http.el	Fri Nov 10 17:08:20 2006 +0000
+++ b/lisp/url/url-http.el	Fri Nov 10 17:09:01 2006 +0000
@@ -92,7 +92,7 @@
 
 (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 @@
   (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 @@
     (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