Mercurial > emacs
changeset 80207:79daf9fe0585
Revert last fix; subset of last fix recommitted.
(url-digest-auth): If the 'opaque' argument is not being used, don't
add it to the response text.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Mon, 25 Feb 2008 17:11:25 +0000 |
| parents | e3016c2df775 |
| children | 698ec2860078 |
| files | lisp/url/url-auth.el |
| diffstat | 1 files changed, 13 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/url/url-auth.el Mon Feb 25 17:11:07 2008 +0000 +++ b/lisp/url/url-auth.el Mon Feb 25 17:11:25 2008 +0000 @@ -158,7 +158,7 @@ (setq file (cond (realm realm) ((string-match "/$" file) file) - (t (url-basepath file))) + (t (url-file-directory file))) server (format "%s:%d" server port) byserv (cdr-safe (assoc server url-digest-auth-storage))) (cond @@ -188,18 +188,18 @@ (string= data (substring file 0 (length data))))) (setq retval (cdr (car byserv)))) (setq byserv (cdr byserv)))) - (if overwrite - (if (and (not retval) prompt) - (setq user (read-string (url-auth-user-prompt url realm) - (user-real-login-name)) - pass (read-passwd "Password: ") - retval (setq retval - (cons user - (url-digest-auth-create-key - user pass realm - (or url-request-method "GET") - url))) - byserv (assoc server url-digest-auth-storage)) + (if (or (and (not retval) prompt) overwrite) + (progn + (setq user (read-string (url-auth-user-prompt url realm) + (user-real-login-name)) + pass (read-passwd "Password: ") + retval (setq retval + (cons user + (url-digest-auth-create-key + user pass realm + (or url-request-method "GET") + url))) + byserv (assoc server url-digest-auth-storage)) (setcdr byserv (cons (cons file retval) (cdr byserv)))))) (t (setq retval nil)))