diff options
Diffstat (limited to 'lisp/url/url-proxy.el')
| -rw-r--r-- | lisp/url/url-proxy.el | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/lisp/url/url-proxy.el b/lisp/url/url-proxy.el index 8436c7a4be2..c89c1b6bc3e 100644 --- a/lisp/url/url-proxy.el +++ b/lisp/url/url-proxy.el @@ -49,14 +49,12 @@ ;; Not sure how I should handle gracefully degrading from one proxy to ;; another, so for now just deal with the first one ;; (while proxies - (if (listp proxies) - (setq proxy (car proxies)) - (setq proxy proxies)) + (setq proxy (if (listp proxies) (car proxies) proxies)) (cond - ((string-match "^direct" proxy) nil) - ((string-match "^proxy +" proxy) + ((string-match "^DIRECT" proxy) nil) + ((string-match "^PROXY +" proxy) (concat "http://" (substring proxy (match-end 0)) "/")) - ((string-match "^socks +" proxy) + ((string-match "^SOCKS +" proxy) (concat "socks://" (substring proxy (match-end 0)))) (t (display-warning 'url (format "Unknown proxy directive: %s" proxy) :error) |