diff options
author | Sean Whitton <spwhitton@spwhitton.name> | 2021-08-19 16:48:59 -0700 |
---|---|---|
committer | Sean Whitton <spwhitton@spwhitton.name> | 2021-08-19 16:48:59 -0700 |
commit | 07fcbb558d797272b9f43547da60beda485873a3 (patch) | |
tree | 77d5da14e9f9d9d8b1d877c70c01296fd3893796 /lisp/url/url-proxy.el | |
parent | c9bdeff3e45a7ac84a74a81bb048046f82dddc91 (diff) | |
parent | fb81c8c3adf8633f2f617c82f6019aef630860c7 (diff) | |
download | emacs-07fcbb558d797272b9f43547da60beda485873a3.tar.gz |
Merge remote-tracking branch 'origin/master' into athena/unstable
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) |