Regression in "Proxy-authorization header incorrectly sent to server during SSL session."

bug 127671 r=rpotts sr=darin a=asa

netwerk/protocol/http/src/nsHttpChannel.cpp

@@ -433,7 +433,7 @@ nsHttpChannel::SetupTransaction()
 
     return mTransaction->SetupRequest(&mRequestHead, mUploadStream, 
                                       mUploadStreamHasHeaders, 
-                                      mConnectionInfo->UsingHttpProxy() && !mConnectionInfo->UsingSSL());
+                                      mConnectionInfo->UsingHttpProxy() && mConnectionInfo->UsingSSL());
 }
 
 void

netwerk/protocol/http/src/nsHttpConnection.cpp

@@ -513,7 +513,7 @@ nsHttpConnection::SetupSSLProxyConnect()
     }
 
     buf.Truncate(0);
-    request.Flatten(buf, PR_TRUE);
+    request.Flatten(buf, PR_FALSE);
     buf.Append("\r\n");
 
     rv = NS_NewCStringInputStream(getter_AddRefs(mSSLProxyConnectStream), buf);