author | Adrian Schröter <adrian@suse.de> |
Fri, 25 May 2012 09:12:54 +0200 | |
branch | firefox13 |
changeset 452 | fdd2f0742049 |
parent 416 | 72a48d628998 |
permissions | -rw-r--r-- |
413
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1 |
# HG changeset patch |
416
72a48d628998
fixed mozilla-revert_621446.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
413
diff
changeset
|
2 |
# Parent 8da41a2cee774ce4d00b9ac1032a495b8bc560a0 |
413
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
3 |
Revert investigation patch for bmo#621446; as it is useless on desktop and breaks the build for certain compilers |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
4 |
|
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
5 |
diff --git a/netwerk/protocol/http/HttpChannelParent.cpp b/netwerk/protocol/http/HttpChannelParent.cpp |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
6 |
--- a/netwerk/protocol/http/HttpChannelParent.cpp |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
7 |
+++ b/netwerk/protocol/http/HttpChannelParent.cpp |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
8 |
@@ -52,29 +52,25 @@ |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
9 |
#include "nsIBadCertListener2.h" |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
10 |
#include "nsICacheEntryDescriptor.h" |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
11 |
#include "nsSerializationHelper.h" |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
12 |
#include "nsISerializable.h" |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
13 |
#include "nsIAssociatedContentSecurity.h" |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
14 |
#include "nsIApplicationCacheService.h" |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
15 |
#include "nsIOfflineCacheUpdate.h" |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
16 |
#include "nsIRedirectChannelRegistrar.h" |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
17 |
-#include "prinit.h" |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
18 |
|
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
19 |
namespace mozilla { |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
20 |
namespace net { |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
21 |
|
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
22 |
HttpChannelParent::HttpChannelParent(PBrowserParent* iframeEmbedding) |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
23 |
: mIPCClosed(false) |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
24 |
, mStoredStatus(0) |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
25 |
, mStoredProgress(0) |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
26 |
, mStoredProgressMax(0) |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
27 |
- , mSentRedirect1Begin(false) |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
28 |
- , mSentRedirect1BeginFailed(false) |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
29 |
- , mReceivedRedirect2Verify(false) |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
30 |
{ |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
31 |
// Ensure gHttpHandler is initialized: we need the atom table up and running. |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
32 |
nsIHttpProtocolHandler* handler; |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
33 |
CallGetService(NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "http", &handler); |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
34 |
NS_ASSERTION(handler, "no http handler"); |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
35 |
|
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
36 |
mTabParent = do_QueryObject(static_cast<TabParent*>(iframeEmbedding)); |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
37 |
} |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
38 |
@@ -326,21 +322,16 @@ HttpChannelParent::RecvUpdateAssociatedC |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
39 |
mAssociatedContentSecurity->SetCountSubRequestsHighSecurity(high); |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
40 |
mAssociatedContentSecurity->SetCountSubRequestsLowSecurity(low); |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
41 |
mAssociatedContentSecurity->SetCountSubRequestsBrokenSecurity(broken); |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
42 |
mAssociatedContentSecurity->SetCountSubRequestsNoSecurity(no); |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
43 |
} |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
44 |
return true; |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
45 |
} |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
46 |
|
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
47 |
-// Bug 621446 investigation, we don't want conditional PR_Aborts bellow to be |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
48 |
-// merged to a single address. |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
49 |
-#pragma warning(disable : 4068) |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
50 |
-#pragma GCC optimize ("O0") |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
51 |
- |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
52 |
bool |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
53 |
HttpChannelParent::RecvRedirect2Verify(const nsresult& result, |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
54 |
const RequestHeaderTuples& changedHeaders) |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
55 |
{ |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
56 |
if (NS_SUCCEEDED(result)) { |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
57 |
nsCOMPtr<nsIHttpChannel> newHttpChannel = |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
58 |
do_QueryInterface(mRedirectChannel); |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
59 |
|
416
72a48d628998
fixed mozilla-revert_621446.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
413
diff
changeset
|
60 |
@@ -348,40 +339,21 @@ HttpChannelParent::RecvRedirect2Verify(c |
413
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
61 |
for (PRUint32 i = 0; i < changedHeaders.Length(); i++) { |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
62 |
newHttpChannel->SetRequestHeader(changedHeaders[i].mHeader, |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
63 |
changedHeaders[i].mValue, |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
64 |
changedHeaders[i].mMerge); |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
65 |
} |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
66 |
} |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
67 |
} |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
68 |
|
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
69 |
- if (!mRedirectCallback) { |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
70 |
- // Bug 621446 investigation (optimization turned off above) |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
71 |
- if (mReceivedRedirect2Verify) |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
72 |
- NS_RUNTIMEABORT("Duplicate fire"); |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
73 |
- if (mSentRedirect1BeginFailed) |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
74 |
- NS_RUNTIMEABORT("Send to child failed"); |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
75 |
- if (mSentRedirect1Begin && NS_FAILED(result)) |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
76 |
- NS_RUNTIMEABORT("Redirect failed"); |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
77 |
- if (mSentRedirect1Begin && NS_SUCCEEDED(result)) |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
78 |
- NS_RUNTIMEABORT("Redirect succeeded"); |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
79 |
- if (!mRedirectChannel) |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
80 |
- NS_RUNTIMEABORT("Missing redirect channel"); |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
81 |
- } |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
82 |
- |
416
72a48d628998
fixed mozilla-revert_621446.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
413
diff
changeset
|
83 |
- mReceivedRedirect2Verify = true; |
72a48d628998
fixed mozilla-revert_621446.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
413
diff
changeset
|
84 |
- |
413
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
85 |
mRedirectCallback->OnRedirectVerifyCallback(result); |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
86 |
mRedirectCallback = nsnull; |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
87 |
return true; |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
88 |
} |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
89 |
|
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
90 |
-// Bug 621446 investigation |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
91 |
-#pragma GCC reset_options |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
92 |
- |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
93 |
bool |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
94 |
HttpChannelParent::RecvDocumentChannelCleanup() |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
95 |
{ |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
96 |
// From now on only using mAssociatedContentSecurity. Free everything else. |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
97 |
mChannel = 0; // Reclaim some memory sooner. |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
98 |
mCacheDescriptor = 0; // Else we'll block other channels reading same URI |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
99 |
return true; |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
100 |
} |
416
72a48d628998
fixed mozilla-revert_621446.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
413
diff
changeset
|
101 |
@@ -583,24 +555,18 @@ HttpChannelParent::StartRedirect(PRUint3 |
413
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
102 |
|
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
103 |
nsHttpChannel *httpChan = static_cast<nsHttpChannel *>(mChannel.get()); |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
104 |
nsHttpResponseHead *responseHead = httpChan->GetResponseHead(); |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
105 |
bool result = SendRedirect1Begin(newChannelId, |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
106 |
IPC::URI(newURI), |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
107 |
redirectFlags, |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
108 |
responseHead ? *responseHead |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
109 |
: nsHttpResponseHead()); |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
110 |
- if (!result) { |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
111 |
- // Bug 621446 investigation |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
112 |
- mSentRedirect1BeginFailed = true; |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
113 |
+ if (!result) |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
114 |
return NS_BINDING_ABORTED; |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
115 |
- } |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
116 |
- |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
117 |
- // Bug 621446 investigation |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
118 |
- mSentRedirect1Begin = true; |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
119 |
|
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
120 |
// Result is handled in RecvRedirect2Verify above |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
121 |
|
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
122 |
mRedirectChannel = newChannel; |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
123 |
mRedirectCallback = callback; |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
124 |
return NS_OK; |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
125 |
} |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
126 |
|
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
127 |
diff --git a/netwerk/protocol/http/HttpChannelParent.h b/netwerk/protocol/http/HttpChannelParent.h |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
128 |
--- a/netwerk/protocol/http/HttpChannelParent.h |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
129 |
+++ b/netwerk/protocol/http/HttpChannelParent.h |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
130 |
@@ -128,18 +128,14 @@ private: |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
131 |
nsCOMPtr<nsIChannel> mRedirectChannel; |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
132 |
nsCOMPtr<nsIAsyncVerifyRedirectCallback> mRedirectCallback; |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
133 |
|
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
134 |
// state for combining OnStatus/OnProgress with OnDataAvailable |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
135 |
// into one IPDL call to child. |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
136 |
nsresult mStoredStatus; |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
137 |
PRUint64 mStoredProgress; |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
138 |
PRUint64 mStoredProgressMax; |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
139 |
- |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
140 |
- bool mSentRedirect1Begin : 1; |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
141 |
- bool mSentRedirect1BeginFailed : 1; |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
142 |
- bool mReceivedRedirect2Verify : 1; |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
143 |
}; |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
144 |
|
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
145 |
} // namespace net |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
146 |
} // namespace mozilla |
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
147 |
|
974b8a3e2d55
Fix build on openSUSE 11.2 (x86_64) by reverting a temporary debug patch (bmo#621446)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
148 |
#endif // mozilla_net_HttpChannelParent_h |