| author | Wolfgang Rosenauer <wr@rosenauer.org> |
| Thu, 31 Jan 2019 11:21:22 +0100 | |
| branch | firefox65 |
| changeset 1085 | 87f893cf45b9 |
| parent 1067 | 735b140fb042 |
| child 1093 | 3942c205588b |
| permissions | -rw-r--r-- |
| 933 | 1 |
# HG changeset patch |
2 |
# Parent a5cfa3aa11a9d3391df49de6fc5a0e5232c12c10 |
|
|
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
3 |
# Parent 7b5f6b68a8963228f738b803177f937481e19745 |
| 933 | 4 |
Bug 991344 - Rpi3: Firefox crashes after a few seconds of usage |
5 |
||
6 |
diff --git a/netwerk/base/nsIOService.cpp b/netwerk/base/nsIOService.cpp |
|
7 |
--- a/netwerk/base/nsIOService.cpp |
|
8 |
+++ b/netwerk/base/nsIOService.cpp |
|
|
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
9 |
@@ -842,17 +842,23 @@ nsresult nsIOService::NewChannelFromURIW |
|
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
10 |
"doesn't support nsIUploadChannel2. An extension has " |
|
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
11 |
"supplied a non-functional http protocol handler. This will " |
|
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
12 |
"break behavior and in future releases not work at all."); |
|
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
13 |
} |
|
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
14 |
gHasWarnedUploadChannel2 = true; |
| 933 | 15 |
} |
|
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
16 |
} |
| 933 | 17 |
|
18 |
+#if defined(__aarch64__) |
|
|
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
19 |
+ if (result) {
|
|
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
20 |
+ channel.forget(result); |
|
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
21 |
+ } |
| 933 | 22 |
+#else |
|
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
23 |
channel.forget(result); |
| 933 | 24 |
+#endif |
|
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
25 |
return NS_OK; |
| 933 | 26 |
} |
27 |
||
28 |
NS_IMETHODIMP |
|
|
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
29 |
nsIOService::NewChannelFromURIWithProxyFlags2( |
|
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
30 |
nsIURI *aURI, nsIURI *aProxyURI, uint32_t aProxyFlags, |
|
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
31 |
nsINode *aLoadingNode, nsIPrincipal *aLoadingPrincipal, |
|
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
32 |
nsIPrincipal *aTriggeringPrincipal, uint32_t aSecurityFlags, |