diff options
| author | Karoly Lorentey <[email protected]> | 2007-02-24 19:26:54 +0000 |
|---|---|---|
| committer | Karoly Lorentey <[email protected]> | 2007-02-24 19:26:54 +0000 |
| commit | f65f7603312547e51230192daf34349b8ac569a0 (patch) | |
| tree | cbc5877854d00bbdd5ecd4906d130ab8fbb44430 /lisp/url/url-http.el | |
| parent | 9440b75fccbf763e3fb23a31a128d97eb4debdf5 (diff) | |
| parent | 735895f1fa28f88c559e73910ea0ff0bda0f228c (diff) | |
Merged from [email protected]
Patches applied:
* [email protected]/emacs--devo--0--patch-619
Update from CVS
* [email protected]/emacs--devo--0--patch-620
Update from CVS
* [email protected]/emacs--devo--0--patch-621
Merge from gnus--rel--5.10
* [email protected]/emacs--devo--0--patch-622
Update from CVS
* [email protected]/emacs--devo--0--patch-623
Remove RCS keywords
* [email protected]/emacs--devo--0--patch-624
Update from CVS
* [email protected]/emacs--devo--0--patch-625
Update from CVS
* [email protected]/emacs--devo--0--patch-626
Update from CVS
* [email protected]/emacs--devo--0--patch-627
Update from CVS
* [email protected]/emacs--devo--0--patch-628
Update from CVS
* [email protected]/emacs--devo--0--patch-629
Merge from gnus--rel--5.10
* [email protected]/emacs--devo--0--patch-630
Update from CVS
* [email protected]/emacs--devo--0--patch-631
Update from CVS
* [email protected]/emacs--devo--0--patch-632
Update from CVS
* [email protected]/emacs--devo--0--patch-633
Update from CVS
* [email protected]/emacs--devo--0--patch-634
Update from CVS
* [email protected]/emacs--devo--0--patch-635
Update from CVS
* [email protected]/emacs--devo--0--patch-636
Update from CVS
* [email protected]/emacs--devo--0--patch-637
Remove RCS keywords
* [email protected]/emacs--devo--0--patch-638
Update from CVS
* [email protected]/emacs--devo--0--patch-639
Update from CVS
* [email protected]/emacs--devo--0--patch-640
Update from CVS
* [email protected]/emacs--devo--0--patch-641
Update from CVS
* [email protected]/emacs--devo--0--patch-642
Merge from gnus--rel--5.10
* [email protected]/emacs--devo--0--patch-643
Update from CVS
* [email protected]/emacs--devo--0--patch-644
Update from CVS
* [email protected]/emacs--devo--0--patch-645
Update from CVS
* [email protected]/emacs--devo--0--patch-646
Update from CVS
* [email protected]/emacs--devo--0--patch-647
Update from CVS
* [email protected]/emacs--devo--0--patch-648
Update from CVS
* [email protected]/emacs--devo--0--patch-649
Update from CVS
* [email protected]/gnus--rel--5.10--patch-197
Merge from emacs--devo--0
* [email protected]/gnus--rel--5.10--patch-198
Update from CVS
* [email protected]/gnus--rel--5.10--patch-199
Update from CVS
* [email protected]/gnus--rel--5.10--patch-200
Merge from emacs--devo--0
* [email protected]/gnus--rel--5.10--patch-201
Update from CVS: lisp/nnweb.el (nnweb-google-parse-1): Update parser.
* [email protected]/gnus--rel--5.10--patch-202
Update from CVS
git-archimport-id: [email protected]/emacs--multi-tty--0--patch-596
Diffstat (limited to 'lisp/url/url-http.el')
| -rw-r--r-- | lisp/url/url-http.el | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el index eb193f1c7a..1d4d64f0e4 100644 --- a/lisp/url/url-http.el +++ b/lisp/url/url-http.el @@ -30,6 +30,7 @@ (defvar url-http-extra-headers) (defvar url-http-target-url) (defvar url-http-proxy) +(defvar url-http-connection-opened) (require 'url-gw) (require 'url-util) (require 'url-parse) @@ -1118,6 +1119,7 @@ CBARGS as the arguments." url-http-extra-headers url-http-data url-http-target-url + url-http-connection-opened url-http-proxy)) (set (make-local-variable var) nil)) @@ -1132,6 +1134,7 @@ CBARGS as the arguments." url-callback-arguments cbargs url-http-after-change-function 'url-http-wait-for-headers-change-function url-http-target-url url-current-object + url-http-connection-opened nil url-http-proxy url-using-proxy) (set-process-buffer connection buffer) @@ -1155,8 +1158,10 @@ CBARGS as the arguments." ;; has occurred. (with-current-buffer (process-buffer proc) (cond + (url-http-connection-opened + (url-http-end-of-document-sentinel proc why)) ((string= (substring why 0 4) "open") - (set-process-sentinel proc 'url-http-end-of-document-sentinel) + (setq url-http-connection-opened t) (process-send-string proc (url-http-create-request))) (t (setf (car url-callback-arguments) |