HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Switch license to GPLv3 or later.
[bpt/emacs.git]
/
lisp
/
url
/
url-auth.el
diff --git
a/lisp/url/url-auth.el
b/lisp/url/url-auth.el
index
260315c
..
c57a96c
100644
(file)
--- a/
lisp/url/url-auth.el
+++ b/
lisp/url/url-auth.el
@@
-1,6
+1,7
@@
;;; url-auth.el --- Uniform Resource Locator authorization modules
;;; url-auth.el --- Uniform Resource Locator authorization modules
-;; Copyright (c) 1996 - 1999 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
+;; 2005, 2006, 2007 Free Software Foundation, Inc.
;; Keywords: comm, data, processes, hypermedia
;; Keywords: comm, data, processes, hypermedia
@@
-8,7
+9,7
@@
;; GNU Emacs is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; GNU Emacs is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version
2
, or (at your option)
+;; the Free Software Foundation; either version
3
, or (at your option)
;; any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
@@
-18,8
+19,8
@@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 5
9 Temple Place - Suite 330
,
-;; Boston, MA 0211
1-1307
, USA.
+;; Free Software Foundation, Inc., 5
1 Franklin Street, Fifth Floor
,
+;; Boston, MA 0211
0-1301
, USA.
;;; Code:
;;; Code:
@@
-93,7
+94,7
@@
instead of the pathname inheritance method."
(string-match "/" path))
(while (and byserv (not retval))
(setq data (car (car byserv)))
(string-match "/" path))
(while (and byserv (not retval))
(setq data (car (car byserv)))
- (if (or (not (string-match "/" data)) ; Its a realm - take it!
+ (if (or (not (string-match "/" data)) ; It
'
s a realm - take it!
(and
(>= (length path) (length data))
(string= data (substring path 0 (length data)))))
(and
(>= (length path) (length data))
(string= data (substring path 0 (length data)))))
@@
-230,7
+231,7
@@
TYPE is the type of authentication to be returned. This is either a string
representing the type (basic, digest, etc), or nil or the symbol 'any'
to specify that any authentication is acceptable. If requesting 'any'
the strongest matching authentication will be returned. If this is
representing the type (basic, digest, etc), or nil or the symbol 'any'
to specify that any authentication is acceptable. If requesting 'any'
the strongest matching authentication will be returned. If this is
- wrong, its no big deal, the error from the server will specify exactly
+ wrong, it
'
s no big deal, the error from the server will specify exactly
what type of auth to use
PROMPT is boolean - specifies whether to ask the user for a username/password
if one cannot be found in the cache"
what type of auth to use
PROMPT is boolean - specifies whether to ask the user for a username/password
if one cannot be found in the cache"
@@
-293,7
+294,7
@@
RATING a rating between 1 and 10 of the strength of the authentication.
(function (or function (intern (concat "url-" type "-auth"))))
(rating (cond
((null rating) 2)
(function (or function (intern (concat "url-" type "-auth"))))
(rating (cond
((null rating) 2)
- ((stringp rating) (string-to-
int
rating))
+ ((stringp rating) (string-to-
number
rating))
(t rating)))
(node (assoc type url-registered-auth-schemes)))
(if (not (fboundp function))
(t rating)))
(node (assoc type url-registered-auth-schemes)))
(if (not (fboundp function))