Bug 436344 - Allow filtering of proxies by channel. r=mcmanus

2015-01-21 21:13:00 +01:00
parent 73d8e63483
commit a68e31a789
19 changed files with 376 additions and 208 deletions
--- a/netwerk/protocol/websocket/WebSocketChannel.cpp
+++ b/netwerk/protocol/websocket/WebSocketChannel.cpp
@@ -2562,7 +2562,7 @@ WebSocketChannel::ApplyForAdmission()

  MOZ_ASSERT(!mCancelable);

-  return pps->AsyncResolve(mURI,
+  return pps->AsyncResolve(mHttpChannel,
                           nsIProtocolProxyService::RESOLVE_PREFER_HTTPS_PROXY |
                           nsIProtocolProxyService::RESOLVE_ALWAYS_TUNNEL,
                           this, getter_AddRefs(mCancelable));
@@ -2683,7 +2683,7 @@ WebSocketChannel::OnLookupComplete(nsICancelable *aRequest,

 // nsIProtocolProxyCallback
 NS_IMETHODIMP
-WebSocketChannel::OnProxyAvailable(nsICancelable *aRequest, nsIURI *aURI,
+WebSocketChannel::OnProxyAvailable(nsICancelable *aRequest, nsIChannel *aChannel,
                                   nsIProxyInfo *pi, nsresult status)
 {
  if (mStopped) {