[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/url-http-ntlm dd393b8 12/42: url-http-ntlm: Use url-htt
From: |
Stefan Monnier |
Subject: |
[elpa] externals/url-http-ntlm dd393b8 12/42: url-http-ntlm: Use url-http-ntlm namespace consistently |
Date: |
Sat, 28 Nov 2020 17:19:44 -0500 (EST) |
branch: externals/url-http-ntlm
commit dd393b871cbf54cbbecd61d640d955b1aaa97779
Author: Thomas Fitzsimmons <fitzsim@fitzsim.org>
Commit: Thomas Fitzsimmons <fitzsim@fitzsim.org>
url-http-ntlm: Use url-http-ntlm namespace consistently
* url-http-ntlm.el (url-ntlm-auth): Call
url-http-ntlm-ensure-keepalive and url-http-ntlm-get-stage.
(url-http-ntlm-ensure-keepalive): Rename from
url-ntlm-ensure-keepalive.
(url-http-ntlm-clean-headers): Rename from url-ntlm-clean-headers.
(url-http-ntlm-last-args): Rename from url-ntlm-last-args.
(url-http-ntlm-get-stage): Rename from url-ntlm-get-stage.
(url-http-ntlm-get-stage): Reference url-http-ntlm-last-args.
Call url-http-ntlm-clean-headers.
---
url-http-ntlm.el | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/url-http-ntlm.el b/url-http-ntlm.el
index 3fadb04..86649a6 100644
--- a/url-http-ntlm.el
+++ b/url-http-ntlm.el
@@ -66,8 +66,8 @@ PROMPT, OVERWRITE, and REALM are ignored.
ARGS is expected to contain the WWW-Authentication header from
the server's last response. These are used by
`url-http-get-stage' to determine what stage we are at."
- (url-ntlm-ensure-keepalive)
- (let ((stage (url-ntlm-get-stage args)))
+ (url-http-ntlm-ensure-keepalive)
+ (let ((stage (url-http-ntlm-get-stage args)))
(case stage
;; NTLM Type 1 message: the request
(:request
@@ -88,24 +88,24 @@ the server's last response. These are used by
(:error
(url-http-ntlm-authorisation url :clear)))))
-(defun url-ntlm-ensure-keepalive ()
+(defun url-http-ntlm-ensure-keepalive ()
"Report an error if `url-http-attempt-keepalives' is not set."
(assert url-http-attempt-keepalives
nil
(concat "NTLM authentication won't work unless"
" `url-http-attempt-keepalives' is set!")))
-(defun url-ntlm-clean-headers ()
+(defun url-http-ntlm-clean-headers ()
"Remove Authorization element from `url-http-extra-headers' alist."
(setq url-http-extra-headers
(url-http-ntlm-rmssoc "Authorization" url-http-extra-headers)))
-(defvar url-ntlm-last-args nil
- "Stores the last ARGS argument to `url-ntlm-get-stage' and the return value.
+(defvar url-http-ntlm-last-args nil
+ "Stores the last `url-http-ntlm-get-stage' arguments and return value.
This is used to detect multiple calls.")
-(make-variable-buffer-local 'url-ntlm-last-args)
+(make-variable-buffer-local 'url-http-ntlm-last-args)
-(defun url-ntlm-get-stage (args)
+(defun url-http-ntlm-get-stage (args)
"Determine what stage of the NTLM handshake we are at.
PROMPT and ARGS come from `url-ntlm-auth''s caller,
`url-get-authentication'. Their meaning depends on the current
@@ -122,9 +122,9 @@ response's \"WWW-Authenticate\" header, munged by
(auth-header (assoc "Authorization" url-http-extra-headers))
(case-fold-search t)
stage)
- (if (eq args (car url-ntlm-last-args))
+ (if (eq args (car url-http-ntlm-last-args))
;; multiple calls, return the same argument we returned last time
- (cdr url-ntlm-last-args)
+ (cdr url-http-ntlm-last-args)
(let ((stage
(cond ((and auth-header (string-match response-rxp
(cdr auth-header)))
@@ -137,8 +137,8 @@ response's \"WWW-Authenticate\" header, munged by
:response)
(t
:request))))
- (url-ntlm-clean-headers)
- (setq url-ntlm-last-args (cons args stage))
+ (url-http-ntlm-clean-headers)
+ (setq url-http-ntlm-last-args (cons args stage))
stage))))
(defun url-http-ntlm-authorisation (url &optional clear)
- [elpa] externals/url-http-ntlm b92ef48 37/42: url-http-ntlm: Bump ntlm required version to 2.1.0, (continued)
- [elpa] externals/url-http-ntlm b92ef48 37/42: url-http-ntlm: Bump ntlm required version to 2.1.0, Stefan Monnier, 2020/11/28
- [elpa] externals/url-http-ntlm c7587cb 39/42: url-http-ntlm.el: Omit user and domain in Type 1 message, Stefan Monnier, 2020/11/28
- [elpa] externals/url-http-ntlm 5ca617f 40/42: url-http-ntlm: Bump version to 2.0.4, Stefan Monnier, 2020/11/28
- [elpa] externals/url-http-ntlm ec0acb3 30/42: url-http-ntlm.el: Bump version to 2.0.0, Stefan Monnier, 2020/11/28
- [elpa] externals/url-http-ntlm 4c2295b 35/42: Fix some quoting problems in doc strings, Stefan Monnier, 2020/11/28
- [elpa] externals/url-http-ntlm f5276f1 42/42: * .gitignore: New file, Stefan Monnier, 2020/11/28
- [elpa] externals/url-http-ntlm a55ae6c 01/42: url-http-ntlm: New package, Stefan Monnier, 2020/11/28
- [elpa] externals/url-http-ntlm 9c79150 02/42: url-http-ntlm: Remove trailing whitespace, Stefan Monnier, 2020/11/28
- [elpa] externals/url-http-ntlm 530faf7 04/42: url-http-ntlm: Wrap lines at column 80, Stefan Monnier, 2020/11/28
- [elpa] externals/url-http-ntlm 722e32f 05/42: url-http-ntlm: Fix checkdoc errors, Stefan Monnier, 2020/11/28
- [elpa] externals/url-http-ntlm dd393b8 12/42: url-http-ntlm: Use url-http-ntlm namespace consistently,
Stefan Monnier <=
- [elpa] externals/url-http-ntlm 5c47391 13/42: url-http-ntlm.el (url-ntlm-auth): Move defun near end of file, Stefan Monnier, 2020/11/28
- [elpa] externals/url-http-ntlm 0dad577 08/42: url-http-ntlm.el: Update copyright owner and years, Stefan Monnier, 2020/11/28
- [elpa] externals/url-http-ntlm 9813aea 19/42: url-http-ntlm: Prevent infinite loops, Stefan Monnier, 2020/11/28
- [elpa] externals/url-http-ntlm be85e0a 21/42: url-http-ntlm: Declare url-http-extra-headers special, Stefan Monnier, 2020/11/28
- [elpa] externals/url-http-ntlm 790fbd3 25/42: url-http-ntlm: Change spelling of authorization function, Stefan Monnier, 2020/11/28
- [elpa] externals/url-http-ntlm 2aed8ca 22/42: url-http-ntlm: Autoload url-ntlm-auth and its registration, Stefan Monnier, 2020/11/28
- [elpa] externals/url-http-ntlm c2db685 28/42: url-http-ntlm: Add `url-debug' debugging messages, Stefan Monnier, 2020/11/28
- [elpa] externals/url-http-ntlm 544d008 27/42: url-http-ntlm: Shorten first line of some docstrings, Stefan Monnier, 2020/11/28
- [elpa] externals/url-http-ntlm 9d142fc 32/42: url-http-ntlm.el: Bump version to 2.0.1, Stefan Monnier, 2020/11/28
- [elpa] externals/url-http-ntlm 2a29445 34/42: url-http-ntlm: Bump version to 2.0.2, Stefan Monnier, 2020/11/28