diff options
| -rw-r--r-- | lisp/url/ChangeLog | 18 | ||||
| -rw-r--r-- | lisp/url/url.el | 1 |
2 files changed, 18 insertions, 1 deletions
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog index c4a22bd314e..16bb2f59d75 100644 --- a/lisp/url/ChangeLog +++ b/lisp/url/ChangeLog @@ -1,3 +1,21 @@ +2007-01-14 Magnus Henoch <mange@freemail.hu> + + * url-proxy.el (url-proxy-object): Remove. + (url-proxy): Don't use `url-proxy-object'. Act according to type of + proxy (currently only HTTP supported). + + * url.el (url-retrieve-internal): Don't use `url-proxy-object'. + + * url-http.el (url-http-proxy): New variable. + (url-http-create-request): Use it. Don't use `url-proxy-object'. + (url-http): Treat `url' argument as resource to download, and + dynamic variable `url-using-proxy' as proxy to use. Set + `url-current-object' to actual URL, and `url-http-proxy' to proxy + used. + (url-http-handle-cookies): Assume that `url-current-object' does + not point to the proxy used. + (url-http-async-sentinel): Adapt error message. + 2006-12-10 Juanma Barranquero <lekktu@gmail.com> * url-gw.el (url-gateway-nslookup-program): Doc fix. diff --git a/lisp/url/url.el b/lisp/url/url.el index 4ba604203dc..a95c7e39c02 100644 --- a/lisp/url/url.el +++ b/lisp/url/url.el @@ -172,7 +172,6 @@ the list of events, as described in the docstring of `url-retrieve'." (unless (url-type url) (error "Bad url: %s" (url-recreate-url url))) (let ((loader (url-scheme-get-property (url-type url) 'loader)) - (url-proxy-object nil) (url-using-proxy (if (url-host url) (url-find-proxy-for-url url (url-host url)))) (buffer nil) |