diff options
| author | Glenn Morris <rgm@gnu.org> | 2021-02-03 08:11:08 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2021-02-03 08:11:08 -0800 |
| commit | bd5b4b35bc85b19f152e89e3945071ffc48c454d (patch) | |
| tree | c4bb88a4c54f568b4289269ba91614a8adfd0264 /lisp/url/url-http.el | |
| parent | 1ef8d5e0da1060f38bbcc9d840a4bb256a18ed99 (diff) | |
| parent | 7355209f53e1c7f383a1df8b5e294ec9f43ab82e (diff) | |
| download | emacs-bd5b4b35bc85b19f152e89e3945071ffc48c454d.tar.gz emacs-bd5b4b35bc85b19f152e89e3945071ffc48c454d.tar.bz2 emacs-bd5b4b35bc85b19f152e89e3945071ffc48c454d.zip | |
Merge from origin/emacs-27
7355209f53 (origin/emacs-27) * lisp/window.el (recenter-top-bottom): ...
dc78f8a4ea (emacs-27) url-http.el: Special-case NTLM authentication
85b0137858 * lisp/isearch.el (isearch-lazy-highlight): Fix defcustom ...
cbeda21083 Sync latest SKK-JISYO.L
Diffstat (limited to 'lisp/url/url-http.el')
| -rw-r--r-- | lisp/url/url-http.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el index 61e07a0d9ca..8cebd4e79f6 100644 --- a/lisp/url/url-http.el +++ b/lisp/url/url-http.el @@ -461,8 +461,10 @@ Return the number of characters removed." ;; headers, then this means that we've already tried sending ;; credentials to the server, and they were wrong, so just give ;; up. - (when (assoc "Authorization" url-http-extra-headers) - (error "Wrong authorization used for %s" url)) + (let ((authorization (assoc "Authorization" url-http-extra-headers))) + (when (and authorization + (not (string-match "^NTLM " (cdr authorization)))) + (error "Wrong authorization used for %s" url))) ;; find strongest supported auth (dolist (this-auth auths) |