equal
deleted
inserted
replaced
1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent a4b050d8677d437a205e1cb88079ecd359cbd08d |
2 # Parent 8da41a2cee774ce4d00b9ac1032a495b8bc560a0 |
3 Revert investigation patch for bmo#621446; as it is useless on desktop and breaks the build for certain compilers |
3 Revert investigation patch for bmo#621446; as it is useless on desktop and breaks the build for certain compilers |
4 |
4 |
5 diff --git a/netwerk/protocol/http/HttpChannelParent.cpp b/netwerk/protocol/http/HttpChannelParent.cpp |
5 diff --git a/netwerk/protocol/http/HttpChannelParent.cpp b/netwerk/protocol/http/HttpChannelParent.cpp |
6 --- a/netwerk/protocol/http/HttpChannelParent.cpp |
6 --- a/netwerk/protocol/http/HttpChannelParent.cpp |
7 +++ b/netwerk/protocol/http/HttpChannelParent.cpp |
7 +++ b/netwerk/protocol/http/HttpChannelParent.cpp |
55 { |
55 { |
56 if (NS_SUCCEEDED(result)) { |
56 if (NS_SUCCEEDED(result)) { |
57 nsCOMPtr<nsIHttpChannel> newHttpChannel = |
57 nsCOMPtr<nsIHttpChannel> newHttpChannel = |
58 do_QueryInterface(mRedirectChannel); |
58 do_QueryInterface(mRedirectChannel); |
59 |
59 |
60 @@ -348,40 +339,23 @@ HttpChannelParent::RecvRedirect2Verify(c |
60 @@ -348,40 +339,21 @@ HttpChannelParent::RecvRedirect2Verify(c |
61 for (PRUint32 i = 0; i < changedHeaders.Length(); i++) { |
61 for (PRUint32 i = 0; i < changedHeaders.Length(); i++) { |
62 newHttpChannel->SetRequestHeader(changedHeaders[i].mHeader, |
62 newHttpChannel->SetRequestHeader(changedHeaders[i].mHeader, |
63 changedHeaders[i].mValue, |
63 changedHeaders[i].mValue, |
64 changedHeaders[i].mMerge); |
64 changedHeaders[i].mMerge); |
65 } |
65 } |
78 - NS_RUNTIMEABORT("Redirect succeeded"); |
78 - NS_RUNTIMEABORT("Redirect succeeded"); |
79 - if (!mRedirectChannel) |
79 - if (!mRedirectChannel) |
80 - NS_RUNTIMEABORT("Missing redirect channel"); |
80 - NS_RUNTIMEABORT("Missing redirect channel"); |
81 - } |
81 - } |
82 - |
82 - |
83 mReceivedRedirect2Verify = true; |
83 - mReceivedRedirect2Verify = true; |
84 |
84 - |
85 mRedirectCallback->OnRedirectVerifyCallback(result); |
85 mRedirectCallback->OnRedirectVerifyCallback(result); |
86 mRedirectCallback = nsnull; |
86 mRedirectCallback = nsnull; |
87 return true; |
87 return true; |
88 } |
88 } |
89 |
89 |
96 // From now on only using mAssociatedContentSecurity. Free everything else. |
96 // From now on only using mAssociatedContentSecurity. Free everything else. |
97 mChannel = 0; // Reclaim some memory sooner. |
97 mChannel = 0; // Reclaim some memory sooner. |
98 mCacheDescriptor = 0; // Else we'll block other channels reading same URI |
98 mCacheDescriptor = 0; // Else we'll block other channels reading same URI |
99 return true; |
99 return true; |
100 } |
100 } |
101 @@ -583,24 +557,18 @@ HttpChannelParent::StartRedirect(PRUint3 |
101 @@ -583,24 +555,18 @@ HttpChannelParent::StartRedirect(PRUint3 |
102 |
102 |
103 nsHttpChannel *httpChan = static_cast<nsHttpChannel *>(mChannel.get()); |
103 nsHttpChannel *httpChan = static_cast<nsHttpChannel *>(mChannel.get()); |
104 nsHttpResponseHead *responseHead = httpChan->GetResponseHead(); |
104 nsHttpResponseHead *responseHead = httpChan->GetResponseHead(); |
105 bool result = SendRedirect1Begin(newChannelId, |
105 bool result = SendRedirect1Begin(newChannelId, |
106 IPC::URI(newURI), |
106 IPC::URI(newURI), |