From 8f600065244355c3d8059b5467d5b60526f767f4 Mon Sep 17 00:00:00 2001
From: "gavin@gavinsharp.com" <gavin@gavinsharp.com>
Date: Thu, 17 Apr 2008 19:49:40 -0700
Subject: [PATCH] Back out the patch for bug 235853, again, because of
 mochi*chrome* failures this time.

---
 extensions/cookie/test/test_loadflags.html  |  2 +-
 netwerk/base/src/nsIOService.cpp            | 12 +--------
 netwerk/base/src/nsProtocolProxyService.cpp |  3 +--
 netwerk/protocol/http/src/nsHttpChannel.cpp | 27 +++------------------
 netwerk/protocol/http/src/nsHttpChannel.h   |  2 +-
 5 files changed, 7 insertions(+), 39 deletions(-)
diff --git a/extensions/cookie/test/test_loadflags.html b/extensions/cookie/test/test_loadflags.html
index 6f39a7f2e84..1e50680d926 100644
--- a/extensions/cookie/test/test_loadflags.html
+++ b/extensions/cookie/test/test_loadflags.html
@@ -6,7 +6,7 @@
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
-<body onload="setupTest('http://example.org/tests/extensions/cookie/test/file_loadflags_inner.html', 'example.org', 5, 1, 4)">
+<body onload="setupTest('http://example.org/tests/extensions/cookie/test/file_loadflags_inner.html', 'example.org', 5, 1, 2)">
 <p id="display"></p>
 <pre id="test">
 <script class="testbody" type="text/javascript" src="file_testloadflags.js">
diff --git a/netwerk/base/src/nsIOService.cpp b/netwerk/base/src/nsIOService.cpp
index e6206e151af..0329c10e002 100644
--- a/netwerk/base/src/nsIOService.cpp
+++ b/netwerk/base/src/nsIOService.cpp
@@ -550,17 +550,7 @@ nsIOService::NewChannelFromURI(nsIURI *aURI, nsIChannel **result)
                 NS_WARNING("failed to get protocol proxy service");
         }
         if (mProxyService) {
-            PRUint32 flags = 0;
-            if (scheme.EqualsLiteral("http") || scheme.EqualsLiteral("https"))
-                flags = nsIProtocolProxyService::RESOLVE_NON_BLOCKING;
-            rv = mProxyService->Resolve(aURI, flags, getter_AddRefs(pi));
-            if (rv == NS_BASE_STREAM_WOULD_BLOCK) {
-                // Use an UNKNOWN proxy to defer resolution and avoid blocking.
-                rv = mProxyService->NewProxyInfo(NS_LITERAL_CSTRING("unknown"),
-                                                 NS_LITERAL_CSTRING(""),
-                                                 -1, 0, 0, nsnull,
-                                                 getter_AddRefs(pi));
-            }
+            rv = mProxyService->Resolve(aURI, 0, getter_AddRefs(pi));
             if (NS_FAILED(rv))
                 pi = nsnull;
         }
diff --git a/netwerk/base/src/nsProtocolProxyService.cpp b/netwerk/base/src/nsProtocolProxyService.cpp
index 22c40f974cd..3b6f4990a49 100644
--- a/netwerk/base/src/nsProtocolProxyService.cpp
+++ b/netwerk/base/src/nsProtocolProxyService.cpp
@@ -923,8 +923,7 @@ nsProtocolProxyService::NewProxyInfo(const nsACString &aType,
         kProxyType_HTTP,
         kProxyType_SOCKS,
         kProxyType_SOCKS4,
-        kProxyType_DIRECT,
-        kProxyType_UNKNOWN
+        kProxyType_DIRECT
     };
 
     // resolve type; this allows us to avoid copying the type string into each
diff --git a/netwerk/protocol/http/src/nsHttpChannel.cpp b/netwerk/protocol/http/src/nsHttpChannel.cpp
index c79608419e4..b7f0f249124 100644
--- a/netwerk/protocol/http/src/nsHttpChannel.cpp
+++ b/netwerk/protocol/http/src/nsHttpChannel.cpp
@@ -1060,7 +1060,7 @@ nsHttpChannel::DoReplaceWithProxy(nsIProxyInfo* pi)
     if (NS_FAILED(rv))
         return rv;
 
-    rv = SetupReplacementChannel(mURI, newChannel, PR_TRUE, PR_TRUE);
+    rv = SetupReplacementChannel(mURI, newChannel, PR_TRUE);
     if (NS_FAILED(rv))
         return rv;
 
@@ -2249,8 +2249,7 @@ CopyProperties(const nsAString& aKey, nsIVariant *aData, void *aClosure)
 nsresult
 nsHttpChannel::SetupReplacementChannel(nsIURI       *newURI, 
                                        nsIChannel   *newChannel,
-                                       PRBool        preserveMethod,
-                                       PRBool        transferCacheInfo)
+                                       PRBool        preserveMethod)
 {
     PRUint32 newLoadFlags = mLoadFlags | LOAD_REPLACE;
     // if the original channel was using SSL and this channel is not using
@@ -2335,26 +2334,6 @@ nsHttpChannel::SetupReplacementChannel(nsIURI       *newURI,
     if (bag)
         mPropertyHash.EnumerateRead(CopyProperties, bag.get());
 
-    // Transfer the cache info to the new channel, if needed.
-    if (transferCacheInfo) {
-      nsCOMPtr<nsICachingChannel> cachingChannel = do_QueryInterface(newChannel);
-      if (cachingChannel) {
-        // cacheKey is just mPostID wrapped in an nsISupportsPRUint32,
-        // we don't need to transfer it if it's 0.
-        if (mPostID) {
-          nsCOMPtr<nsISupports> cacheKey;
-          GetCacheKey(getter_AddRefs(cacheKey));
-          if (cacheKey) {
-            cachingChannel->SetCacheKey(cacheKey);
-          }
-        }
-
-        // cacheClientID, cacheForOfflineUse
-        cachingChannel->SetOfflineCacheClientID(mOfflineCacheClientID);
-        cachingChannel->SetCacheForOfflineUse(mCacheForOfflineUse);
-      }
-    }
-
     return NS_OK;
 }
 
@@ -2440,7 +2419,7 @@ nsHttpChannel::ProcessRedirection(PRUint32 redirectType)
     rv = ioService->NewChannelFromURI(newURI, getter_AddRefs(newChannel));
     if (NS_FAILED(rv)) return rv;
 
-    rv = SetupReplacementChannel(newURI, newChannel, preserveMethod, PR_FALSE);
+    rv = SetupReplacementChannel(newURI, newChannel, preserveMethod);
     if (NS_FAILED(rv)) return rv;
 
     PRUint32 redirectFlags;
diff --git a/netwerk/protocol/http/src/nsHttpChannel.h b/netwerk/protocol/http/src/nsHttpChannel.h
index 87d7b2589ef..ac836f92b69 100644
--- a/netwerk/protocol/http/src/nsHttpChannel.h
+++ b/netwerk/protocol/http/src/nsHttpChannel.h
@@ -167,7 +167,7 @@ private:
     void     HandleAsyncRedirect();
     void     HandleAsyncNotModified();
     nsresult PromptTempRedirect();
-    nsresult SetupReplacementChannel(nsIURI *, nsIChannel *, PRBool preserveMethod, PRBool transferCacheInfo);
+    nsresult SetupReplacementChannel(nsIURI *, nsIChannel *, PRBool preserveMethod);
 
     // proxy specific methods
     nsresult ProxyFailover();
