Backout changeset 8bbed05c1661 r=bz a=abillings

docshell/base/nsDocShell.cpp

@@ -10766,19 +10766,20 @@ nsDocShell::DoURILoad(nsIURI* aURI,
                                   aReferrerURI);
   }
 
-  nsCOMPtr<nsICacheInfoChannel> cacheChannel(do_QueryInterface(channel));
-  nsCOMPtr<nsIUploadChannel> uploadChannel(do_QueryInterface(channel));
+  //
+  // If this is a HTTP channel, then set up the HTTP specific information
+  // (ie. POST data, referrer, ...)
+  //
+  if (httpChannel) {
+    nsCOMPtr<nsICacheInfoChannel> cacheChannel(do_QueryInterface(httpChannel));
+    /* Get the cache Key from SH */
+    nsCOMPtr<nsISupports> cacheKey;
+    if (mLSHE) {
+      mLSHE->GetCacheKey(getter_AddRefs(cacheKey));
+    } else if (mOSHE) {  // for reload cases
+      mOSHE->GetCacheKey(getter_AddRefs(cacheKey));
+    }
 
-
-  /* Get the cache Key from SH */
-  nsCOMPtr<nsISupports> cacheKey;
-  if (mLSHE) {
-    mLSHE->GetCacheKey(getter_AddRefs(cacheKey));
-  } else if (mOSHE) {  // for reload cases
-    mOSHE->GetCacheKey(getter_AddRefs(cacheKey));
-  }
-
-  if (uploadChannel) {
     // figure out if we need to set the post data stream on the channel...
     // right now, this is only done for http channels.....
     if (aPostData) {
@@ -10792,6 +10793,9 @@ nsDocShell::DoURILoad(nsIURI* aURI,
         NS_ENSURE_SUCCESS(rv, rv);
       }
 
+      nsCOMPtr<nsIUploadChannel> uploadChannel(do_QueryInterface(httpChannel));
+      NS_ASSERTION(uploadChannel, "http must support nsIUploadChannel");
+
       // we really need to have a content type associated with this stream!!
       uploadChannel->SetUploadStream(aPostData, EmptyCString(), -1);
       /* If there is a valid postdata *and* it is a History Load,
@@ -10827,9 +10831,6 @@ nsDocShell::DoURILoad(nsIURI* aURI,
         }
       }
     }
-  }
-
-  if (httpChannel) {
     if (aHeadersData) {
       rv = AddHeadersToChannel(aHeadersData, httpChannel);
     }