1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent a5cfa3aa11a9d3391df49de6fc5a0e5232c12c10 |
2 # Parent a5cfa3aa11a9d3391df49de6fc5a0e5232c12c10 |
3 # Parent 07236b512cd930e3fc7a94fed549431ccaa51c90 |
3 # Parent 7b5f6b68a8963228f738b803177f937481e19745 |
4 Bug 991344 - Rpi3: Firefox crashes after a few seconds of usage |
4 Bug 991344 - Rpi3: Firefox crashes after a few seconds of usage |
5 |
5 |
6 diff --git a/netwerk/base/nsIOService.cpp b/netwerk/base/nsIOService.cpp |
6 diff --git a/netwerk/base/nsIOService.cpp b/netwerk/base/nsIOService.cpp |
7 --- a/netwerk/base/nsIOService.cpp |
7 --- a/netwerk/base/nsIOService.cpp |
8 +++ b/netwerk/base/nsIOService.cpp |
8 +++ b/netwerk/base/nsIOService.cpp |
9 @@ -923,17 +923,23 @@ nsIOService::NewChannelFromURIWithProxyF |
9 @@ -842,17 +842,23 @@ nsresult nsIOService::NewChannelFromURIW |
10 "doesn't support nsIUploadChannel2. An extension has " |
10 "doesn't support nsIUploadChannel2. An extension has " |
11 "supplied a non-functional http protocol handler. This will " |
11 "supplied a non-functional http protocol handler. This will " |
12 "break behavior and in future releases not work at all."); |
12 "break behavior and in future releases not work at all."); |
13 } |
13 } |
14 gHasWarnedUploadChannel2 = true; |
14 gHasWarnedUploadChannel2 = true; |
15 } |
|
16 } |
15 } |
|
16 } |
17 |
17 |
18 +#if defined(__aarch64__) |
18 +#if defined(__aarch64__) |
19 + if (result) { |
19 + if (result) { |
20 + channel.forget(result); |
20 + channel.forget(result); |
21 + } |
21 + } |
22 +#else |
22 +#else |
23 channel.forget(result); |
23 channel.forget(result); |
24 +#endif |
24 +#endif |
25 return NS_OK; |
25 return NS_OK; |
26 } |
26 } |
27 |
27 |
28 NS_IMETHODIMP |
28 NS_IMETHODIMP |
29 nsIOService::NewChannelFromURIWithProxyFlags2(nsIURI* aURI, |
29 nsIOService::NewChannelFromURIWithProxyFlags2( |
30 nsIURI* aProxyURI, |
30 nsIURI *aURI, nsIURI *aProxyURI, uint32_t aProxyFlags, |
31 uint32_t aProxyFlags, |
31 nsINode *aLoadingNode, nsIPrincipal *aLoadingPrincipal, |
32 nsINode* aLoadingNode, |
32 nsIPrincipal *aTriggeringPrincipal, uint32_t aSecurityFlags, |