diff options
| author | Magnus Henoch | 2006-11-15 23:29:56 +0000 |
|---|---|---|
| committer | Magnus Henoch | 2006-11-15 23:29:56 +0000 |
| commit | 6e2988e60d95edb6f4c05ca6aa0e85622548adab (patch) | |
| tree | e46444943f82207ee71b8294aa9d9da51bb6d553 | |
| parent | d58fae84a67394c2b8453e6d7efcd4817b3f4634 (diff) | |
| download | emacs-6e2988e60d95edb6f4c05ca6aa0e85622548adab.tar.gz emacs-6e2988e60d95edb6f4c05ca6aa0e85622548adab.zip | |
(url-http): Make proxy-object buffer-local, to handle proxied
asynchronous connections correctly.
| -rw-r--r-- | lisp/url/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/url/url-http.el | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog index 27f463b0b97..93ebfef961c 100644 --- a/lisp/url/ChangeLog +++ b/lisp/url/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2006-11-15 Magnus Henoch <mange@freemail.hu> | 1 | 2006-11-15 Magnus Henoch <mange@freemail.hu> |
| 2 | 2 | ||
| 3 | * url-http.el (url-http): Make proxy-object buffer-local, to | ||
| 4 | handle proxied asynchronous connections correctly. | ||
| 5 | |||
| 3 | * url-parse.el (url-generic-parse-url): Use with-temp-buffer. | 6 | * url-parse.el (url-generic-parse-url): Use with-temp-buffer. |
| 4 | 7 | ||
| 5 | 2006-11-15 Shun-ichi GOTO <gotoh@taiyo.co.jp> (tiny change) | 8 | 2006-11-15 Shun-ichi GOTO <gotoh@taiyo.co.jp> (tiny change) |
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el index dc670188e26..69c04c51c28 100644 --- a/lisp/url/url-http.el +++ b/lisp/url/url-http.el | |||
| @@ -1071,7 +1071,8 @@ CBARGS as the arguments." | |||
| 1071 | url-http-chunked-length | 1071 | url-http-chunked-length |
| 1072 | url-http-chunked-start | 1072 | url-http-chunked-start |
| 1073 | url-http-chunked-counter | 1073 | url-http-chunked-counter |
| 1074 | url-http-process)) | 1074 | url-http-process |
| 1075 | proxy-object)) | ||
| 1075 | (let ((connection (url-http-find-free-connection (url-host url) | 1076 | (let ((connection (url-http-find-free-connection (url-host url) |
| 1076 | (url-port url))) | 1077 | (url-port url))) |
| 1077 | (buffer (generate-new-buffer (format " *http %s:%d*" | 1078 | (buffer (generate-new-buffer (format " *http %s:%d*" |
| @@ -1106,6 +1107,7 @@ CBARGS as the arguments." | |||
| 1106 | url-http-data | 1107 | url-http-data |
| 1107 | url-http-target-url)) | 1108 | url-http-target-url)) |
| 1108 | (set (make-local-variable var) nil)) | 1109 | (set (make-local-variable var) nil)) |
| 1110 | (make-local-variable 'proxy-object) | ||
| 1109 | 1111 | ||
| 1110 | (setq url-http-method (or url-request-method "GET") | 1112 | (setq url-http-method (or url-request-method "GET") |
| 1111 | url-http-extra-headers url-request-extra-headers | 1113 | url-http-extra-headers url-request-extra-headers |