- tbb-commits - lists.torproject.org

[tor-browser-build/master] Bug 23694: update the detailsURL in update responses
by gk＠torproject.org 17 Oct '17

17 Oct '17

commit ac2aeae99060dde267e89e68f6962047a89ddf80 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Oct 17 15:59:13 2017 +0200 Bug 23694: update the detailsURL in update responses --- projects/release/update_responses_config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/release/update_responses_config.yml b/projects/release/update_responses_config.yml index f0d9dbf..69d8909 100644 --- a/projects/release/update_responses_config.yml +++ b/projects/release/update_responses_config.yml @@ -23,7 +23,7 @@ channels: versions: [% c("var/torbrowser_version") %]: platformVersion: [% pc('firefox', 'var/firefox_platform_version') %] - detailsURL: https://blog.torproject.org/blog/tor-browser-[% c("var/torbrowser_version") FILTER remove('\.') %]-released + detailsURL: https://blog.torproject.org/tor-browser-[% c("var/torbrowser_version") FILTER remove('\.') %]-released incremental_from: [% FOREACH v IN c("var/torbrowser_incremental_from") -%] - [% v %]

1 0

[tor-browser-bundle/maint-7.0] Bug 23694: update the detailsURL in update responses
by gk＠torproject.org 17 Oct '17

17 Oct '17

commit 4082cf0318557c0a4d7d161c88e15ffd9118133c Author: Georg Koppen <gk(a)torproject.org> Date: Tue Oct 17 14:08:56 2017 +0000 Bug 23694: update the detailsURL in update responses Patch by boklm --- tools/update-responses/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 0275d31..1eceba9 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -24,7 +24,7 @@ channels: versions: 7.0.7: platformVersion: 52.4.1 - detailsURL: https://blog.torproject.org/blog/tor-browser-707-released + detailsURL: https://blog.torproject.org/tor-browser-707-released incremental_from: - 7.0.6 migrate_archs:

1 0

[tor-browser-bundle/maint-7.0] Update Changelog file
by gk＠torproject.org 17 Oct '17

17 Oct '17

commit ef1896ec8904a012321f7da74e249913c9e1260f Author: Georg Koppen <gk(a)torproject.org> Date: Tue Oct 17 14:12:47 2017 +0000 Update Changelog file --- Bundle-Data/Docs/ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index c35d20d..6bb4854 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -19,6 +19,7 @@ Tor Browser 7.0.7 -- October 19 2017 * Bug 22472: Fix FTP downloads when external helper app dialog is shown * Bug 22471: Downloading pdf files via the PDF viewer download button is broken * Bug 22618: Downloading pdf file via file:/// is stalling + * Bug 23694: Update the detailsURL in update responses * OS X * Bug 23807: Tab crashes when playing video on High Sierra

1 0

[tor-browser-bundle/maint-7.0] Release preprations for 7.0.7
by gk＠torproject.org 17 Oct '17

17 Oct '17

commit 8aae9b4a45b707c04aba4a1dcc08e3dcf7793bbe Author: Georg Koppen <gk(a)torproject.org> Date: Tue Oct 17 14:05:27 2017 +0000 Release preprations for 7.0.7 Changelog update, version bumps, and update of config.yml --- Bundle-Data/Docs/ChangeLog.txt | 24 ++++++++++++++++++++++++ gitian/versions | 10 +++++----- tools/update-responses/config.yml | 10 +++++----- 3 files changed, 34 insertions(+), 10 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 310cdf0..c35d20d 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,27 @@ +Tor Browser 7.0.7 -- October 19 2017 + * All Platforms + * Update Firefox to 52.4.1esr + * Update Torbutton to 1.9.7.8 + * Bug 23887: Update banner locales and Mozilla text + * Bug 23526: Add 2017 Donation banner text + * Bug 23483: Donation banner on about:tor for 2017 (testing mode) + * Bug 22610: Avoid crashes when canceling external helper app related downloads + * Bug 22472: Fix FTP downloads when external helper app dialog is shown + * Bug 22471: Downloading pdf files via the PDF viewer download button is broken + * Bug 22618: Downloading pdf file via file:/// is stalling + * Translations update + * Update HTTPS-Everywhere to 2017.10.4 + * Update NoScript to 5.1.2 + * Bug 23723: Loading entities from NoScript .dtd files is blocked + * Bug 23724: NoScript update breaks Security Slider and its icon disappears + * Bug 23745: Tab crashes when using Tor Browser to access Google Drive + * Bug 22610: Avoid crashes when canceling external helper app related downloads + * Bug 22472: Fix FTP downloads when external helper app dialog is shown + * Bug 22471: Downloading pdf files via the PDF viewer download button is broken + * Bug 22618: Downloading pdf file via file:/// is stalling + * OS X + * Bug 23807: Tab crashes when playing video on High Sierra + Tor Browser 7.0.6 -- September 26 2017 * All Platforms * Update Firefox to 52.4.0esr diff --git a/gitian/versions b/gitian/versions index 368fb98..e5e9ade 100755 --- a/gitian/versions +++ b/gitian/versions @@ -10,15 +10,15 @@ DATA_OUTSIDE_APP_DIR=1 VERIFY_TAGS=1 -FIREFOX_VERSION=52.4.0esr +FIREFOX_VERSION=52.4.1esr TORBROWSER_UPDATE_CHANNEL=release TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-7.0-1-build1 TOR_TAG=tor-0.3.1.7 TORLAUNCHER_TAG=0.2.12.3 -TORBUTTON_TAG=1.9.7.7 -HTTPSE_TAG=2017.9.12 +TORBUTTON_TAG=1.9.7.8 +HTTPSE_TAG=2017.10.4 NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable @@ -67,7 +67,7 @@ YASM_VER=1.2.0 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-5.0.10-fx+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-5.1.2-fx+sm.xpi CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz MSVCR100_PACKAGE=msvcr100.dll @@ -102,7 +102,7 @@ YASM_PACKAGE=yasm-${YASM_VER}.tar.gz OPENSSL_HASH=6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf -NOSCRIPT_HASH=cfc8018a5ddd2a699581932a9911e28b1060667c7849cf5283b548b5b29a65a2 +NOSCRIPT_HASH=82687646b9ecc39d478ac5d4de035b32fdf88efc6faceec3e74b49c863bbfabb CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 9838c8a..0275d31 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -20,13 +20,13 @@ build_targets: osx64: Darwin_x86_64-gcc3 channels: alpha: 7.0a4 - release: 7.0.6 + release: 7.0.7 versions: - 7.0.6: - platformVersion: 52.4.0 - detailsURL: https://blog.torproject.org/blog/tor-browser-706-released + 7.0.7: + platformVersion: 52.4.1 + detailsURL: https://blog.torproject.org/blog/tor-browser-707-released incremental_from: - - 7.0.5 + - 7.0.6 migrate_archs: osx32: osx64 migrate_langs:

1 0

[torbutton/maint-1.9.7] Release preparations for 1.9.7.8
by gk＠torproject.org 17 Oct '17

17 Oct '17

commit 6204ab402535409a0ddaba41796416fe2103b67f Author: Georg Koppen <gk(a)torproject.org> Date: Tue Oct 17 13:30:36 2017 +0000 Release preparations for 1.9.7.8 CHANGELOG update and version bump --- src/CHANGELOG | 10 ++++++++++ src/install.rdf | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 35f198c..e168ca0 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,13 @@ +1.9.7.8 + * Bug 23887: Update banner locales and Mozilla text + * Bug 23526: Add 2017 Donation banner text + * Bug 23483: Donation banner on about:tor for 2017 (testing mode) + * Bug 22610: Avoid crashes when canceling external helper app related downloads + * Bug 22472: Fix FTP downloads when external helper app dialog is shown + * Bug 22471: Downloading pdf files via the PDF viewer download button is broken + * Bug 22618: Downloading pdf file via file:/// is stalling + * Translations update + 1.9.7.7 * Bug 22542: Security Settings window too small on macOS 10.12 (fixup) * Bug 20375: Warn users after entering fullscreen mode diff --git a/src/install.rdf b/src/install.rdf index 97cdfd7..acbc7e9 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.9.7.7</em:version> + <em:version>1.9.7.8</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL>

1 0

[tor-browser/tor-browser-52.4.0esr-7.0-1] squash! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 17 Oct '17

17 Oct '17

commit 00c8f9b86215e26a2a9785be4a45e8a2d652e224 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Oct 17 00:10:37 2017 -0700 squash! TB4: Tor Browser's Firefox preference overrides. Bug 23745: Set dom.indexedDB.enabled = true --- browser/app/profile/000-tor-browser.js | 1 - 1 file changed, 1 deletion(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 16c23be0d65a..a1e66a80e73f 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -46,7 +46,6 @@ pref("browser.disableResetPrompt", true); pref("browser.privatebrowsing.autostart", true); pref("browser.cache.disk.enable", false); pref("browser.cache.offline.enable", false); -pref("dom.indexedDB.enabled", false); pref("permissions.memory_only", true); pref("network.cookie.lifetimePolicy", 2); pref("browser.download.manager.retention", 1);

1 0

[tor-browser/tor-browser-52.4.0esr-7.0-1] Revert "Bug 21308: Set indexedDB->null when dom.indexeddb.enabled=false"
by gk＠torproject.org 17 Oct '17

17 Oct '17

commit d3222cf5469b28bfb2b018055693d94254df9cd2 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Oct 17 00:08:10 2017 -0700 Revert "Bug 21308: Set indexedDB->null when dom.indexeddb.enabled=false" This reverts commit 31348e47a340494c4002b43d8fb509689f8f7e63. --- dom/indexedDB/IDBFactory.cpp | 4 ++-- dom/indexedDB/test/mochitest.ini | 1 - dom/indexedDB/test/test_disable_indexeddb.html | 28 -------------------------- 3 files changed, 2 insertions(+), 31 deletions(-) diff --git a/dom/indexedDB/IDBFactory.cpp b/dom/indexedDB/IDBFactory.cpp index be17108057f9..1aeff8d1ebc4 100644 --- a/dom/indexedDB/IDBFactory.cpp +++ b/dom/indexedDB/IDBFactory.cpp @@ -133,7 +133,7 @@ IDBFactory::CreateForWindow(nsPIDOMWindowInner* aWindow, if (!(NS_SUCCEEDED(rv) && nsContentUtils::IsSystemPrincipal(principal)) && NS_WARN_IF(!Preferences::GetBool(kPrefIndexedDBEnabled, false))) { *aFactory = nullptr; - return NS_OK; + return NS_ERROR_DOM_INDEXEDDB_NOT_ALLOWED_ERR; } if (rv == NS_ERROR_DOM_NOT_SUPPORTED_ERR) { @@ -249,7 +249,7 @@ IDBFactory::CreateForMainThreadJSInternal( if (aPrincipalInfo->type() != PrincipalInfo::TSystemPrincipalInfo && NS_WARN_IF(!Preferences::GetBool(kPrefIndexedDBEnabled, false))) { *aFactory = nullptr; - return NS_OK; + return NS_ERROR_DOM_INDEXEDDB_NOT_ALLOWED_ERR; } IndexedDatabaseManager* mgr = IndexedDatabaseManager::GetOrCreate(); diff --git a/dom/indexedDB/test/mochitest.ini b/dom/indexedDB/test/mochitest.ini index a4473b26839c..4ab55a9dc2b3 100644 --- a/dom/indexedDB/test/mochitest.ini +++ b/dom/indexedDB/test/mochitest.ini @@ -159,7 +159,6 @@ skip-if = e10s [test_deleteDatabase_interactions.html] [test_deleteDatabase_onblocked.html] [test_deleteDatabase_onblocked_duringVersionChange.html] -[test_disable_indexeddb.html] [test_error_events_abort_transactions.html] [test_event_propagation.html] [test_event_source.html] diff --git a/dom/indexedDB/test/test_disable_indexeddb.html b/dom/indexedDB/test/test_disable_indexeddb.html deleted file mode 100644 index d8a691f9be18..000000000000 --- a/dom/indexedDB/test/test_disable_indexeddb.html +++ /dev/null @@ -1,28 +0,0 @@ -<!DOCTYPE html> -<html> -<head> - <title>Indexed Database Disable Pref test</title> - - <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> - <script type="text/javascript" src="/tests/SimpleTest/SpawnTask.js"></script> - <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/> - -</head> - -<body> - <script> - add_task(function* () { - for (let enable of [false, true]) { - yield SpecialPowers.pushPrefEnv( - {'set': [['dom.indexedDB.enabled', enable]]}); - if (!enable) { - is(indexedDB, null, "indexedDB should be null"); - } else { - isnot(indexedDB, null, "indexedDB should be non-null"); - } - } - }); - </script> -</body> - -</html>

1 0

[tor-browser/tor-browser-52.4.0esr-7.5-1] squash! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 17 Oct '17

17 Oct '17

commit b4fc15a8986a8d2c8267df281b526eafb58bf6d7 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Oct 17 00:10:37 2017 -0700 squash! TB4: Tor Browser's Firefox preference overrides. Bug 23745: Set dom.indexedDB.enabled = true --- browser/app/profile/000-tor-browser.js | 1 - 1 file changed, 1 deletion(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 444c9f39b02a..32922418b12f 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -46,7 +46,6 @@ pref("browser.disableResetPrompt", true); pref("browser.privatebrowsing.autostart", true); pref("browser.cache.disk.enable", false); pref("browser.cache.offline.enable", false); -pref("dom.indexedDB.enabled", false); pref("permissions.memory_only", true); pref("network.cookie.lifetimePolicy", 2); pref("browser.download.manager.retention", 1);

1 0

[tor-browser/tor-browser-52.4.0esr-7.5-1] Revert "Bug 21308: Set indexedDB->null when dom.indexeddb.enabled=false"
by gk＠torproject.org 17 Oct '17

17 Oct '17

commit 03d6c603319adbf80c6a9badc0922fd339fb80cc Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Oct 17 00:08:10 2017 -0700 Revert "Bug 21308: Set indexedDB->null when dom.indexeddb.enabled=false" This reverts commit 31348e47a340494c4002b43d8fb509689f8f7e63. --- dom/indexedDB/IDBFactory.cpp | 4 ++-- dom/indexedDB/test/mochitest.ini | 1 - dom/indexedDB/test/test_disable_indexeddb.html | 28 -------------------------- 3 files changed, 2 insertions(+), 31 deletions(-) diff --git a/dom/indexedDB/IDBFactory.cpp b/dom/indexedDB/IDBFactory.cpp index be17108057f9..1aeff8d1ebc4 100644 --- a/dom/indexedDB/IDBFactory.cpp +++ b/dom/indexedDB/IDBFactory.cpp @@ -133,7 +133,7 @@ IDBFactory::CreateForWindow(nsPIDOMWindowInner* aWindow, if (!(NS_SUCCEEDED(rv) && nsContentUtils::IsSystemPrincipal(principal)) && NS_WARN_IF(!Preferences::GetBool(kPrefIndexedDBEnabled, false))) { *aFactory = nullptr; - return NS_OK; + return NS_ERROR_DOM_INDEXEDDB_NOT_ALLOWED_ERR; } if (rv == NS_ERROR_DOM_NOT_SUPPORTED_ERR) { @@ -249,7 +249,7 @@ IDBFactory::CreateForMainThreadJSInternal( if (aPrincipalInfo->type() != PrincipalInfo::TSystemPrincipalInfo && NS_WARN_IF(!Preferences::GetBool(kPrefIndexedDBEnabled, false))) { *aFactory = nullptr; - return NS_OK; + return NS_ERROR_DOM_INDEXEDDB_NOT_ALLOWED_ERR; } IndexedDatabaseManager* mgr = IndexedDatabaseManager::GetOrCreate(); diff --git a/dom/indexedDB/test/mochitest.ini b/dom/indexedDB/test/mochitest.ini index a4473b26839c..4ab55a9dc2b3 100644 --- a/dom/indexedDB/test/mochitest.ini +++ b/dom/indexedDB/test/mochitest.ini @@ -159,7 +159,6 @@ skip-if = e10s [test_deleteDatabase_interactions.html] [test_deleteDatabase_onblocked.html] [test_deleteDatabase_onblocked_duringVersionChange.html] -[test_disable_indexeddb.html] [test_error_events_abort_transactions.html] [test_event_propagation.html] [test_event_source.html] diff --git a/dom/indexedDB/test/test_disable_indexeddb.html b/dom/indexedDB/test/test_disable_indexeddb.html deleted file mode 100644 index d8a691f9be18..000000000000 --- a/dom/indexedDB/test/test_disable_indexeddb.html +++ /dev/null @@ -1,28 +0,0 @@ -<!DOCTYPE html> -<html> -<head> - <title>Indexed Database Disable Pref test</title> - - <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> - <script type="text/javascript" src="/tests/SimpleTest/SpawnTask.js"></script> - <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/> - -</head> - -<body> - <script> - add_task(function* () { - for (let enable of [false, true]) { - yield SpecialPowers.pushPrefEnv( - {'set': [['dom.indexedDB.enabled', enable]]}); - if (!enable) { - is(indexedDB, null, "indexedDB should be null"); - } else { - isnot(indexedDB, null, "indexedDB should be non-null"); - } - } - }); - </script> -</body> - -</html>

1 0

[tor-browser/tor-browser-52.4.0esr-7.0-1] Revert "Bug 19273: Avoid JavaScript patching of the external app helper dialog."
by gk＠torproject.org 17 Oct '17

17 Oct '17

commit 7c3bb9697882b07c1ad4a496b0ce2e8ec2593969 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Jul 18 16:22:32 2017 -0400 Revert "Bug 19273: Avoid JavaScript patching of the external app helper dialog." This reverts commit 648d842b127e6ca6457d43e45244c65ee1773aa3. --- netwerk/protocol/http/HttpBaseChannel.cpp | 7 --- netwerk/protocol/http/HttpBaseChannel.h | 1 - netwerk/protocol/http/NullHttpChannel.cpp | 6 --- netwerk/protocol/http/nsIHttpChannel.idl | 9 +--- .../protocol/viewsource/nsViewSourceChannel.cpp | 11 ----- .../exthandler/nsExternalHelperAppService.cpp | 57 ---------------------- 6 files changed, 1 insertion(+), 90 deletions(-) diff --git a/netwerk/protocol/http/HttpBaseChannel.cpp b/netwerk/protocol/http/HttpBaseChannel.cpp index 5ea6a002a40f..e0f7edec05f9 100644 --- a/netwerk/protocol/http/HttpBaseChannel.cpp +++ b/netwerk/protocol/http/HttpBaseChannel.cpp @@ -1233,13 +1233,6 @@ NS_IMETHODIMP HttpBaseChannel::SetTopLevelContentWindowId(uint64_t aWindowId) return NS_OK; } -NS_IMETHODIMP HttpBaseChannel::IsPendingUnforced(bool *aIsPendingUnforced) -{ - NS_ENSURE_ARG_POINTER(aIsPendingUnforced); - *aIsPendingUnforced = mIsPending; - return NS_OK; -} - NS_IMETHODIMP HttpBaseChannel::GetTransferSize(uint64_t *aTransferSize) { diff --git a/netwerk/protocol/http/HttpBaseChannel.h b/netwerk/protocol/http/HttpBaseChannel.h index 3a1a8ba525b0..c8184a601b9e 100644 --- a/netwerk/protocol/http/HttpBaseChannel.h +++ b/netwerk/protocol/http/HttpBaseChannel.h @@ -190,7 +190,6 @@ public: NS_IMETHOD SetChannelId(const nsACString& aChannelId) override; NS_IMETHOD GetTopLevelContentWindowId(uint64_t *aContentWindowId) override; NS_IMETHOD SetTopLevelContentWindowId(uint64_t aContentWindowId) override; - NS_IMETHOD IsPendingUnforced(bool *aIsPendingUnforced) override; // nsIHttpChannelInternal NS_IMETHOD GetDocumentURI(nsIURI **aDocumentURI) override; diff --git a/netwerk/protocol/http/NullHttpChannel.cpp b/netwerk/protocol/http/NullHttpChannel.cpp index 8b362cb24233..8c048a6b5a7e 100644 --- a/netwerk/protocol/http/NullHttpChannel.cpp +++ b/netwerk/protocol/http/NullHttpChannel.cpp @@ -82,12 +82,6 @@ NullHttpChannel::SetTopLevelContentWindowId(uint64_t aWindowId) } NS_IMETHODIMP -NullHttpChannel::IsPendingUnforced(bool *_retval) -{ - return NS_ERROR_NOT_IMPLEMENTED; -} - -NS_IMETHODIMP NullHttpChannel::GetTransferSize(uint64_t *aTransferSize) { return NS_ERROR_NOT_IMPLEMENTED; diff --git a/netwerk/protocol/http/nsIHttpChannel.idl b/netwerk/protocol/http/nsIHttpChannel.idl index 0de0676ad156..75ec2c73989a 100644 --- a/netwerk/protocol/http/nsIHttpChannel.idl +++ b/netwerk/protocol/http/nsIHttpChannel.idl @@ -14,7 +14,7 @@ interface nsIHttpHeaderVisitor; * the inspection of the resulting HTTP response status and headers when they * become available. */ -[builtinclass, scriptable, uuid(e0d8071b-5389-48c2-92c7-6708c968044d)] +[builtinclass, scriptable, uuid(c5a4a073-4539-49c7-a3f2-cec3f0619c6c)] interface nsIHttpChannel : nsIChannel { /************************************************************************** @@ -469,11 +469,4 @@ interface nsIHttpChannel : nsIChannel * this channels is being load in. */ attribute uint64_t topLevelContentWindowId; - - /** - * Returns true if a request is pending due to "natural" causes and - * not just because ForcePending() has been called. See isPending() - * in nsIRequest.idl for more details about pending requests. - */ - boolean isPendingUnforced(); }; diff --git a/netwerk/protocol/viewsource/nsViewSourceChannel.cpp b/netwerk/protocol/viewsource/nsViewSourceChannel.cpp index 9f9b89438fba..9ed71c4ef001 100644 --- a/netwerk/protocol/viewsource/nsViewSourceChannel.cpp +++ b/netwerk/protocol/viewsource/nsViewSourceChannel.cpp @@ -740,17 +740,6 @@ nsViewSourceChannel::SetTopLevelContentWindowId(uint64_t aWindowId) } NS_IMETHODIMP -nsViewSourceChannel::IsPendingUnforced(bool *result) -{ - if (mHttpChannel) { - return mHttpChannel->IsPendingUnforced(result); - } - - NS_ENSURE_TRUE(mChannel, NS_ERROR_FAILURE); - return mChannel->IsPending(result); -} - -NS_IMETHODIMP nsViewSourceChannel::GetRequestMethod(nsACString & aRequestMethod) { return !mHttpChannel ? NS_ERROR_NULL_POINTER : diff --git a/uriloader/exthandler/nsExternalHelperAppService.cpp b/uriloader/exthandler/nsExternalHelperAppService.cpp index 7d2dad321b6c..1c0dd8ee66f7 100644 --- a/uriloader/exthandler/nsExternalHelperAppService.cpp +++ b/uriloader/exthandler/nsExternalHelperAppService.cpp @@ -41,7 +41,6 @@ #include "nsThreadUtils.h" #include "nsAutoPtr.h" #include "nsIMutableArray.h" -#include "nsISupportsPrimitives.h" // for nsISupportsPRBool // used to access our datastore of user-configured helper applications #include "nsIHandlerService.h" @@ -106,7 +105,6 @@ #include "mozilla/Preferences.h" #include "mozilla/ipc/URIUtils.h" -#include "mozilla/Unused.h" using namespace mozilla; using namespace mozilla::ipc; @@ -439,22 +437,6 @@ static nsresult GetDownloadDirectory(nsIFile **_directory, return NS_OK; } -static nsresult shouldCancel(bool *aShouldCancel) -{ - NS_ENSURE_ARG_POINTER(aShouldCancel); - - nsCOMPtr<nsISupportsPRBool> cancelObj = - do_CreateInstance(NS_SUPPORTS_PRBOOL_CONTRACTID); - cancelObj->SetData(false); - nsCOMPtr<nsIObserverService> obs = mozilla::services::GetObserverService(); - if (!obs) - return NS_ERROR_FAILURE; - - obs->NotifyObservers(cancelObj, "external-app-requested", nullptr); - cancelObj->GetData(aShouldCancel); - return NS_OK; -} - /** * Structure for storing extension->type mappings. * @see defaultMimeEntries @@ -1132,14 +1114,6 @@ nsExternalHelperAppService::LoadURI(nsIURI *aURI, return NS_OK; // explicitly denied } - // Give other modules, including extensions, a chance to cancel. - bool doCancel = false; - rv = shouldCancel(&doCancel); - NS_ENSURE_SUCCESS(rv, rv); - if (doCancel) { - return NS_OK; - } - nsCOMPtr<nsIHandlerInfo> handler; rv = GetProtocolHandlerInfo(scheme, getter_AddRefs(handler)); NS_ENSURE_SUCCESS(rv, rv); @@ -1764,37 +1738,6 @@ NS_IMETHODIMP nsExternalAppHandler::OnStartRequest(nsIRequest *request, nsISuppo return NS_OK; } - // Give other modules, including extensions, a chance to cancel. - // To avoid a problem where OnDataAvailable fires but is not handled - // correctly while a modal dialog displayed by Torbutton is open, we - // suspend and then we either cancel or resume active requests. - // See bugs 21766 and 21886. - bool isPending = false; - nsCOMPtr<nsIHttpChannel> httpChan = do_QueryInterface(request); - if (httpChan) { - rv = httpChan->IsPendingUnforced(&isPending); - } else { - rv = request->IsPending(&isPending); - } - NS_ENSURE_SUCCESS(rv, rv); - - if (isPending) { - Unused << request->Suspend(); // Best effort: ignore failures. - } - - bool doCancel = false; - rv = shouldCancel(&doCancel); - NS_ENSURE_SUCCESS(rv, rv); - if (doCancel) { - mCanceled = true; - request->Cancel(NS_BINDING_ABORTED); - return NS_OK; - } - - if (isPending) { - Unused << request->Resume(); // Best effort: ignore failures. - } - rv = SetUpTempFile(aChannel); if (NS_FAILED(rv)) { nsresult transferError = rv;

1 0