[Emacs-diffs] emacs-25 24228d2: Allow http://user:address@hidden/ URLs again

[Lars Ingebrigtsen]

branch: emacs-25
commit 24228d28dc97ca924a36f249365ad183ca4836c7
Author: Lars Ingebrigtsen <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>

    Allow http://user:address@hidden/ URLs again
    
    * lisp/url/url-auth.el (url-basic-auth): Allow explicit
    user/passwords in URLs (bug#19046).
    
    Backport:
    
    (cherry picked from commit b563715a2db265517d5a77f165a42afa1e233fdd)
---
 lisp/url/url-auth.el |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/lisp/url/url-auth.el b/lisp/url/url-auth.el
index 31c1532..75a9e38 100644
--- a/lisp/url/url-auth.el
+++ b/lisp/url/url-auth.el
@@ -80,6 +80,9 @@ instead of the filename inheritance method."
          byserv (cdr-safe (assoc server
                                  (symbol-value url-basic-auth-storage))))
     (cond
+     ((and user pass)
+      ;; Explicit http://user:address@hidden/ URL.  Just return the 
credentials.
+      (setq retval (base64-encode-string (format "%s:%s" user pass))))
      ((and prompt (not byserv))
       (setq user (or
                  (url-do-auth-source-search server type :user)