[tbb-commits] [tor-browser/tor-browser-31.6.0esr-4.5-1] fixup! Bug #3455.2. Allow RFC1929 authentication (username/password) to SOCKS servers.

[mikeperry at torproject.org]

commit f259a80f3ee5a51e9826cdd1979d19a1f3943897
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Mon May 4 16:55:15 2015 +0200

    fixup! Bug #3455.2. Allow RFC1929 authentication (username/password) to SOCKS servers.
    
    Remove unused variables proxyHost and proxyPort to fix
    unused-but-set-variable build errors.
---
 netwerk/base/src/nsSocketTransport2.cpp |    4 ----
 1 file changed, 4 deletions(-)

diff --git a/netwerk/base/src/nsSocketTransport2.cpp b/netwerk/base/src/nsSocketTransport2.cpp
index baa14da..658f2e0 100644
--- a/netwerk/base/src/nsSocketTransport2.cpp
+++ b/netwerk/base/src/nsSocketTransport2.cpp
@@ -1080,8 +1080,6 @@ nsSocketTransport::BuildSocket(PRFileDesc *&fd, bool &proxyTransparent, bool &us
 
         const char *host       = mHost.get();
         int32_t     port       = (int32_t) mPort;
-        const char *proxyHost  = mProxyHost.IsEmpty() ? nullptr : mProxyHost.get();
-        int32_t     proxyPort  = (int32_t) mProxyPort;
         uint32_t    proxyFlags = 0;
         nsCOMPtr<nsIProxyInfo> proxyInfo = mProxyInfo;
 
@@ -1154,8 +1152,6 @@ nsSocketTransport::BuildSocket(PRFileDesc *&fd, bool &proxyTransparent, bool &us
                 // since socks is transparent, any layers above
                 // it do not have to worry about proxy stuff
                 proxyInfo = nullptr;
-                proxyHost = nullptr;
-                proxyPort = -1;
                 proxyTransparent = true;
             }
         }