commit 44cd9b47cb74544aa6eac4b1b0f3d4474457c3dc Author: Georg Koppen gk@torproject.org Date: Tue Apr 14 10:27:02 2015 +0000
fixup! Bug #3455.2. Allow RFC1929 authentication (username/password) to SOCKS servers. --- netwerk/protocol/http/nsHttpConnectionInfo.cpp | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/netwerk/protocol/http/nsHttpConnectionInfo.cpp b/netwerk/protocol/http/nsHttpConnectionInfo.cpp index 2ef09b6..c602902 100644 --- a/netwerk/protocol/http/nsHttpConnectionInfo.cpp +++ b/netwerk/protocol/http/nsHttpConnectionInfo.cpp @@ -98,6 +98,11 @@ nsHttpConnectionInfo::SetOriginServer(const nsACString &host, int32_t port) // information so that a change in proxy config will mean this connection // is not reused
+ // NOTE: Adding the username and the password provides a means to isolate + // keep-alive to the URL bar domain as well: If the username is the URL bar + // domain, keep-alive connections are not reused by resources bound to + // different URL bar domains as the respective hash keys are not matching. + if ((!mUsingHttpProxy && ProxyHost()) || (mUsingHttpProxy && mUsingConnect)) { mHashKey.AppendLiteral(" (");