[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 6fb3a70 12/32: url-http-ntlm: Use url-http-ntlm namespace
From: |
Thomas Fitzsimmons |
Subject: |
[elpa] master 6fb3a70 12/32: url-http-ntlm: Use url-http-ntlm namespace consistently |
Date: |
Thu, 18 Feb 2016 03:27:48 +0000 |
branch: master
commit 6fb3a70ac0053b1a890bede183e08597cc10daaa
Author: Thomas Fitzsimmons <address@hidden>
Commit: Thomas Fitzsimmons <address@hidden>
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.
---
packages/url-http-ntlm/url-http-ntlm.el | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/packages/url-http-ntlm/url-http-ntlm.el
b/packages/url-http-ntlm/url-http-ntlm.el
index 3fadb04..86649a6 100644
--- a/packages/url-http-ntlm/url-http-ntlm.el
+++ b/packages/url-http-ntlm/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] master 087d353 02/32: url-http-ntlm: Remove trailing whitespace, (continued)
- [elpa] master 087d353 02/32: url-http-ntlm: Remove trailing whitespace, Thomas Fitzsimmons, 2016/02/17
- [elpa] master 0bbbe59 03/32: url-http-ntlm.el: Adjust blank lines, Thomas Fitzsimmons, 2016/02/17
- [elpa] master 9e52a39 04/32: url-http-ntlm: Wrap lines at column 80, Thomas Fitzsimmons, 2016/02/17
- [elpa] master 0799c67 05/32: url-http-ntlm: Fix checkdoc errors, Thomas Fitzsimmons, 2016/02/17
- [elpa] master 8482b90 06/32: url-http-ntlm: Remove blank comment lines, Thomas Fitzsimmons, 2016/02/17
- [elpa] master 50656c4 07/32: url-http-ntlm.el: Reindent whole file, Thomas Fitzsimmons, 2016/02/17
- [elpa] master cec4982 08/32: url-http-ntlm.el: Update copyright owner and years, Thomas Fitzsimmons, 2016/02/17
- [elpa] master 2d39d5d 09/32: url-http-ntlm.el: Add maintainer header, Thomas Fitzsimmons, 2016/02/17
- [elpa] master 3033c48 10/32: url-http-ntlm.el: Update installation instructions, Thomas Fitzsimmons, 2016/02/17
- [elpa] master 19e93aa 11/32: url-http-ntlm.el: Update author's email address, Thomas Fitzsimmons, 2016/02/17
- [elpa] master 6fb3a70 12/32: url-http-ntlm: Use url-http-ntlm namespace consistently,
Thomas Fitzsimmons <=
- [elpa] master 4128f4f 13/32: url-http-ntlm.el (url-ntlm-auth): Move defun near end of file, Thomas Fitzsimmons, 2016/02/17
- [elpa] master 55e7f42 14/32: url-http-ntlm.el (url-http-ntlm-last-args): Group defvar with others, Thomas Fitzsimmons, 2016/02/17
- [elpa] master d251ed3 15/32: url-http-ntlm: Use double dash naming convention for private symbols, Thomas Fitzsimmons, 2016/02/17
- [elpa] master 47e1c41 16/32: url-http-ntlm.el: Add comment headings, Thomas Fitzsimmons, 2016/02/17
- [elpa] master 8ce1ae7 17/32: url-http-ntlm: Port to cl-lib, Thomas Fitzsimmons, 2016/02/17
- [elpa] master 2dbfb38 19/32: url-http-ntlm: Prevent infinite loops, Thomas Fitzsimmons, 2016/02/17
- [elpa] master 355e756 20/32: url-http-ntlm: Remove limit of one username and password per server, Thomas Fitzsimmons, 2016/02/17
- [elpa] master 0f6ba4d 21/32: url-http-ntlm: Declare url-http-extra-headers special, Thomas Fitzsimmons, 2016/02/17
- [elpa] master eba1c75 18/32: url-http-ntlm: Override url-http-parse-headers redirect handling, Thomas Fitzsimmons, 2016/02/17
- [elpa] master 904d3e6 22/32: url-http-ntlm: Autoload url-ntlm-auth and its registration, Thomas Fitzsimmons, 2016/02/17