b=149868 http must never use starttls type sockets, even when going over a proxy. http allows all flavors of SSL2/SSL3/TLS (while startls type sockets disallow some flavors).

r=bbaetz sr=darin

netwerk/protocol/http/src/nsHttpConnection.cpp

@@ -497,12 +497,8 @@ nsHttpConnection::CreateTransport()
     // configure the socket type based on the connection type requested.
     const char* type = nsnull;
 
-    if (mConnectionInfo->UsingSSL()) {
-        if (mConnectionInfo->UsingHttpProxy())
-            type = "tlsstepup";
-        else
-            type = "ssl";
-    }
+    if (mConnectionInfo->UsingSSL())
+        type = "ssl";
 
     nsCOMPtr<nsITransport> transport;
     rv = sts->CreateTransportOfType(type,