From b563715a2db265517d5a77f165a42afa1e233fdd Mon Sep 17 00:00:00 2001
From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Fri, 25 Dec 2015 20:21:46 +0100
Subject: [PATCH] Allow http://user:pass@foo/ URLs again

* lisp/url/url-auth.el (url-basic-auth): Allow explicit
user/passwords in URLs (bug#19046).
---
 lisp/url/url-auth.el | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lisp/url/url-auth.el b/lisp/url/url-auth.el
index 87f67183b55..b419db58ca9 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:pass@foo/ 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)
-- 
2.39.2