2
# Parent 28613a5ff81bf1e4fd203655a9db50eea22dd912
3
# User Chris Coulson <chris.coulson@canonical.com>
5
Index: mozilla/mozilla/netwerk/protocol/http/HttpChannelParent.cpp
6
===================================================================
7
--- mozilla.orig/mozilla/netwerk/protocol/http/HttpChannelParent.cpp 2012-01-23 02:08:29.000000000 +0000
8
+++ mozilla/mozilla/netwerk/protocol/http/HttpChannelParent.cpp 2012-01-23 14:23:35.799182395 +0000
10
#include "nsIApplicationCacheService.h"
11
#include "nsIOfflineCacheUpdate.h"
12
#include "nsIRedirectChannelRegistrar.h"
20
, mStoredProgressMax(0)
21
- , mSentRedirect1Begin(false)
22
- , mSentRedirect1BeginFailed(false)
23
- , mReceivedRedirect2Verify(false)
25
// Ensure gHttpHandler is initialized: we need the atom table up and running.
26
nsIHttpProtocolHandler* handler;
31
-// Bug 621446 investigation, we don't want conditional PR_Aborts bellow to be
32
-// merged to a single address.
33
-#pragma warning(disable : 4068)
34
-#pragma GCC optimize ("O0")
37
HttpChannelParent::RecvRedirect2Verify(const nsresult& result,
38
const RequestHeaderTuples& changedHeaders)
43
- if (!mRedirectCallback) {
44
- // Bug 621446 investigation (optimization turned off above)
45
- if (mReceivedRedirect2Verify)
46
- NS_RUNTIMEABORT("Duplicate fire");
47
- if (mSentRedirect1BeginFailed)
48
- NS_RUNTIMEABORT("Send to child failed");
49
- if (mSentRedirect1Begin && NS_FAILED(result))
50
- NS_RUNTIMEABORT("Redirect failed");
51
- if (mSentRedirect1Begin && NS_SUCCEEDED(result))
52
- NS_RUNTIMEABORT("Redirect succeeded");
53
- if (!mRedirectChannel)
54
- NS_RUNTIMEABORT("Missing redirect channel");
57
- mReceivedRedirect2Verify = true;
59
mRedirectCallback->OnRedirectVerifyCallback(result);
60
mRedirectCallback = nsnull;
64
-// Bug 621446 investigation
65
-#pragma GCC reset_options
68
HttpChannelParent::RecvDocumentChannelCleanup()
72
responseHead ? *responseHead
73
: nsHttpResponseHead());
75
- // Bug 621446 investigation
76
- mSentRedirect1BeginFailed = true;
78
return NS_BINDING_ABORTED;
81
- // Bug 621446 investigation
82
- mSentRedirect1Begin = true;
84
// Result is handled in RecvRedirect2Verify above
86
Index: mozilla/mozilla/netwerk/protocol/http/HttpChannelParent.h
87
===================================================================
88
--- mozilla.orig/mozilla/netwerk/protocol/http/HttpChannelParent.h 2012-01-23 02:08:29.000000000 +0000
89
+++ mozilla/mozilla/netwerk/protocol/http/HttpChannelParent.h 2012-01-23 14:24:01.663183457 +0000
91
nsresult mStoredStatus;
92
PRUint64 mStoredProgress;
93
PRUint64 mStoredProgressMax;
95
- bool mSentRedirect1Begin : 1;
96
- bool mSentRedirect1BeginFailed : 1;
97
- bool mReceivedRedirect2Verify : 1;