# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1332535800 -3600
# Node ID 72a48d62899839fd80eaaca74c0170bed2d528aa
# Parent  89b986a13002c64f91e082b2a8bb685978e5ac8f
fixed mozilla-revert_621446.patch

diff -r 89b986a13002 -r 72a48d628998 mozilla-revert_621446.patch
--- a/mozilla-revert_621446.patch	Thu Mar 22 14:38:11 2012 +0100
+++ b/mozilla-revert_621446.patch	Fri Mar 23 21:50:00 2012 +0100
@@ -1,5 +1,5 @@
 # HG changeset patch
-# Parent a4b050d8677d437a205e1cb88079ecd359cbd08d
+# Parent 8da41a2cee774ce4d00b9ac1032a495b8bc560a0
 Revert investigation patch for bmo#621446; as it is useless on desktop and breaks the build for certain compilers
 
 diff --git a/netwerk/protocol/http/HttpChannelParent.cpp b/netwerk/protocol/http/HttpChannelParent.cpp
@@ -57,7 +57,7 @@
      nsCOMPtr<nsIHttpChannel> newHttpChannel =
          do_QueryInterface(mRedirectChannel);
  
-@@ -348,40 +339,23 @@ HttpChannelParent::RecvRedirect2Verify(c
+@@ -348,40 +339,21 @@ HttpChannelParent::RecvRedirect2Verify(c
        for (PRUint32 i = 0; i < changedHeaders.Length(); i++) {
          newHttpChannel->SetRequestHeader(changedHeaders[i].mHeader,
                                           changedHeaders[i].mValue,
@@ -80,8 +80,8 @@
 -      NS_RUNTIMEABORT("Missing redirect channel");
 -  }
 -
-   mReceivedRedirect2Verify = true;
- 
+-  mReceivedRedirect2Verify = true;
+-
    mRedirectCallback->OnRedirectVerifyCallback(result);
    mRedirectCallback = nsnull;
    return true;
@@ -98,7 +98,7 @@
    mCacheDescriptor = 0;  // Else we'll block other channels reading same URI
    return true;
  }
-@@ -583,24 +557,18 @@ HttpChannelParent::StartRedirect(PRUint3
+@@ -583,24 +555,18 @@ HttpChannelParent::StartRedirect(PRUint3
  
    nsHttpChannel *httpChan = static_cast<nsHttpChannel *>(mChannel.get());
    nsHttpResponseHead *responseHead = httpChan->GetResponseHead();