tor-commits May 2017

tor-commits@lists.torproject.org

16 participants
1135 discussions

[torspec/master] Add some handshake terminology to glossary
by nickm＠torproject.org 22 May '17

22 May '17

commit 6049c9517c17d8aa5ad7a0ba53778637388816b6 Author: Taylor Yu <catalyst(a)torproject.org> Date: Thu May 18 12:25:56 2017 -0400 Add some handshake terminology to glossary --- glossary.txt | 44 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 40 insertions(+), 4 deletions(-) diff --git a/glossary.txt b/glossary.txt index dda94e0..767080d 100644 --- a/glossary.txt +++ b/glossary.txt @@ -118,10 +118,46 @@ citing them authoritatively. ;) summary of them in the network consensus. 3.0 Tor network protocols - Link handshake - Circuit handshake - Hidden Service Protocol - Directory Protocol + + 3.1 Link handshake + + The link handshake establishes the TLS connection over which two + Tor participants will send Tor cells. This handshake also + authenticates the participants to each other, possibly using Tor + cells. + + 3.2 Circuit handshake + + Circuit handshakes establish the hop-by-hop onion encryption + that clients use to tunnel their application traffic. The + client does a pairwise key establishment handshake with each + individual relay in the circuit. For every hop except the + first, these handshakes tunnel through existing hops in the + circuit. Each cell type in this protocol also has a newer + version (with a "2" suffix), e.g., CREATE2. + + CREATE cell: First part of a handshake, sent by the initiator. + + CREATED cell: Second part of a handshake, sent by the responder. + + EXTEND cell: (also known as a RELAY_EXTEND cell) First part of a + handshake, tunneled through an existing circuit. The last relay + in the circuit so far will decrypt this cell and send the + payload in a CREATED cell to the chosen next hop relay. + + EXTENDED cell: (also known as a RELAY_EXTENDED cell) Second part + of a handshake, tunneled through an existing circuit. The last + relay in the circuit so far receives the CREATED cell from the + new last hop relay and encrypts the payload in an EXTENDED cell + to tunnel back to the client. + + Onion skin: A CREATE/CREATE2 or EXTEND/EXTEND2 payload that + contains the first part of the TAP or ntor key establishment + handshake. + + 3.3 Hidden Service Protocol + + 3.4 Directory Protocol 4.0 General network definitions

1 0

[torspec/master] Merge remote-tracking branch 'argonblue/glossary'
by nickm＠torproject.org 22 May '17

22 May '17

commit 1d4e05b9626e4554606b90e83301a71d199c1295 Merge: c71d8c9 6049c95 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 22 08:39:38 2017 -0400 Merge remote-tracking branch 'argonblue/glossary' glossary.txt | 44 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 40 insertions(+), 4 deletions(-)

1 0

[sandboxed-tor-browser/master] Bump the version to 0.0.8-dev, so I can do development again.
by yawning＠torproject.org 22 May '17

22 May '17

commit 3ebd74a7b1cf05e07cb518078998789f753bb5c1 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Mon May 22 10:09:28 2017 +0000 Bump the version to 0.0.8-dev, so I can do development again. --- ChangeLog | 2 ++ data/version | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 4ba8b53..90de34d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,5 @@ +Changes in version 0.0.8 - UNRELEASED: + Changes in version 0.0.7 - 2017-05-22: * Bug 21977: Fetch install/update metadata files from a different location. * Bug 22038: Stub out `pa_start_child_for_read`. diff --git a/data/version b/data/version index 5a5831a..02cc5f6 100644 --- a/data/version +++ b/data/version @@ -1 +1 @@ -0.0.7 +0.0.8-dev

1 0

[sandboxed-tor-browser/master] Do the release ritual for sandboxed-tor-browser-0.0.7.
by yawning＠torproject.org 22 May '17

22 May '17

commit e8d953fca8088816e6fe8afbe4b57845dfaeecaa Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Mon May 22 10:06:53 2017 +0000 Do the release ritual for sandboxed-tor-browser-0.0.7. --- ChangeLog | 2 +- data/version | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7091c61..4ba8b53 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -Changes in version 0.0.7 - UNRELEASED: +Changes in version 0.0.7 - 2017-05-22: * Bug 21977: Fetch install/update metadata files from a different location. * Bug 22038: Stub out `pa_start_child_for_read`. diff --git a/data/version b/data/version index f69d83a..5a5831a 100644 --- a/data/version +++ b/data/version @@ -1 +1 @@ -0.0.7-dev +0.0.7

1 0

[sandboxed-tor-browser/master] Add a note in the README about the MIT-SHM bug. No functional changes.
by yawning＠torproject.org 22 May '17

22 May '17

commit 7d55a23cafe770471becd7b2ebded005ae04e9d1 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Mon May 22 10:05:11 2017 +0000 Add a note in the README about the MIT-SHM bug. No functional changes. --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 53a885f..9f173cc 100644 --- a/README.md +++ b/README.md @@ -48,6 +48,9 @@ Upstream Bugs: (https://bugs.torproject.org/20283) * OpenGL software rendering is broken on certain Linux systems. (https://bugs.torproject.org/20866) + * On certain systems, Firefox crashes with an X11 error due to the lack of + MIT-SHM support. This appears to be a race condition, and still occurs + despite mitigations. (https://bugzilla.mozilla.org/show_bug.cgi?id=1271100) Notes:

1 0

[tor-browser/tor-browser-52.1.1esr-7.0-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 22 May '17

22 May '17

commit 886808dc4e21eef3595fa1042f792927bb898193 Author: Georg Koppen <gk(a)torproject.org> Date: Mon May 22 08:36:35 2017 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. The Battery API is not available to content anymore since Firefox 52. Thus, we don't need to set `dom.battery.enabled` anymore. Fixes bug 5293. --- 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 fb7b078..7b0ad71 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -137,7 +137,6 @@ pref("social.whitelist", ""); pref("webgl.min_capability_mode", true); pref("webgl.disable-extensions", true); pref("webgl.disable-fail-if-major-performance-caveat", true); -pref("dom.battery.enabled", false); // fingerprinting due to differing OS implementations pref("dom.network.enabled",false); // fingerprinting due to differing OS implementations pref("gfx.downloadable_fonts.fallback_delay", -1); pref("general.appname.override", "Netscape");

1 0

[tor-browser/tor-browser-52.1.0esr-7.0-2] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 22 May '17

22 May '17

commit 885479878d591ce61fa573912eae4ea062dc54c6 Author: Georg Koppen <gk(a)torproject.org> Date: Mon May 22 08:36:35 2017 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. The Battery API is not available to content anymore since Firefox 52. Thus, we don't need to set `dom.battery.enabled` anymore. Fixes bug 5293. --- 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 fb7b078..7b0ad71 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -137,7 +137,6 @@ pref("social.whitelist", ""); pref("webgl.min_capability_mode", true); pref("webgl.disable-extensions", true); pref("webgl.disable-fail-if-major-performance-caveat", true); -pref("dom.battery.enabled", false); // fingerprinting due to differing OS implementations pref("dom.network.enabled",false); // fingerprinting due to differing OS implementations pref("gfx.downloadable_fonts.fallback_delay", -1); pref("general.appname.override", "Netscape");

1 0

[tor-browser/tor-browser-52.1.0esr-7.0-2] fixup! Bug 19273: Avoid JavaScript patching of the external app helper dialog.
by gk＠torproject.org 22 May '17

22 May '17

commit 1d1fdea85218586354a1294cb94026279e74a0e3 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri May 19 11:25:31 2017 -0400 fixup! Bug 19273: Avoid JavaScript patching of the external app helper dialog. For e10s compatibility, send the "external-app-requested" observer notification later in the download process, and suspend active requests while doing so. Fixes bug 21766. This change also fixes a problem in the esr52-based browser where downloads stalled when e10s was disabled. Fixes bug 21886. --- 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 | 41 +++++++++++++++++----- 6 files changed, 66 insertions(+), 9 deletions(-) diff --git a/netwerk/protocol/http/HttpBaseChannel.cpp b/netwerk/protocol/http/HttpBaseChannel.cpp index e0f7ede..5ea6a00 100644 --- a/netwerk/protocol/http/HttpBaseChannel.cpp +++ b/netwerk/protocol/http/HttpBaseChannel.cpp @@ -1233,6 +1233,13 @@ 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 c8184a6..3a1a8ba 100644 --- a/netwerk/protocol/http/HttpBaseChannel.h +++ b/netwerk/protocol/http/HttpBaseChannel.h @@ -190,6 +190,7 @@ 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 8c048a6..8b362cb 100644 --- a/netwerk/protocol/http/NullHttpChannel.cpp +++ b/netwerk/protocol/http/NullHttpChannel.cpp @@ -82,6 +82,12 @@ 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 75ec2c7..0de0676 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(c5a4a073-4539-49c7-a3f2-cec3f0619c6c)] +[builtinclass, scriptable, uuid(e0d8071b-5389-48c2-92c7-6708c968044d)] interface nsIHttpChannel : nsIChannel { /************************************************************************** @@ -469,4 +469,11 @@ 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 9ed71c4..9f9b894 100644 --- a/netwerk/protocol/viewsource/nsViewSourceChannel.cpp +++ b/netwerk/protocol/viewsource/nsViewSourceChannel.cpp @@ -740,6 +740,17 @@ 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 dfaa218..4c25ae2 100644 --- a/uriloader/exthandler/nsExternalHelperAppService.cpp +++ b/uriloader/exthandler/nsExternalHelperAppService.cpp @@ -106,6 +106,7 @@ #include "mozilla/Preferences.h" #include "mozilla/ipc/URIUtils.h" +#include "mozilla/Unused.h" using namespace mozilla; using namespace mozilla::ipc; @@ -731,14 +732,6 @@ NS_IMETHODIMP nsExternalHelperAppService::DoContent(const nsACString& aMimeConte aForceSave, aWindowContext, aStreamListener); } - // Give other modules, including extensions, a chance to cancel. - bool doCancel = false; - nsresult rv = shouldCancel(&doCancel); - NS_ENSURE_SUCCESS(rv, rv); - if (doCancel) { - return NS_ERROR_FAILURE; - } - nsAutoString fileName; nsAutoCString fileExtension; uint32_t reason = nsIHelperAppLauncherDialog::REASON_CANTHANDLE; @@ -775,6 +768,7 @@ NS_IMETHODIMP nsExternalHelperAppService::DoContent(const nsACString& aMimeConte nsAutoCString query; // We only care about the query for HTTP and HTTPS URLs + nsresult rv; bool isHTTP, isHTTPS; rv = uri->SchemeIs("http", &isHTTP); if (NS_FAILED(rv)) { @@ -1675,6 +1669,37 @@ 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

[tor-browser/tor-browser-52.1.1esr-7.0-1] fixup! Bug 19273: Avoid JavaScript patching of the external app helper dialog.
by gk＠torproject.org 22 May '17

22 May '17

commit 4a4285cbd06a825e5f2277d12a2e5165eab59837 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri May 19 11:25:31 2017 -0400 fixup! Bug 19273: Avoid JavaScript patching of the external app helper dialog. For e10s compatibility, send the "external-app-requested" observer notification later in the download process, and suspend active requests while doing so. Fixes bug 21766. This change also fixes a problem in the esr52-based browser where downloads stalled when e10s was disabled. Fixes bug 21886. --- 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 | 41 +++++++++++++++++----- 6 files changed, 66 insertions(+), 9 deletions(-) diff --git a/netwerk/protocol/http/HttpBaseChannel.cpp b/netwerk/protocol/http/HttpBaseChannel.cpp index e0f7ede..5ea6a00 100644 --- a/netwerk/protocol/http/HttpBaseChannel.cpp +++ b/netwerk/protocol/http/HttpBaseChannel.cpp @@ -1233,6 +1233,13 @@ 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 c8184a6..3a1a8ba 100644 --- a/netwerk/protocol/http/HttpBaseChannel.h +++ b/netwerk/protocol/http/HttpBaseChannel.h @@ -190,6 +190,7 @@ 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 8c048a6..8b362cb 100644 --- a/netwerk/protocol/http/NullHttpChannel.cpp +++ b/netwerk/protocol/http/NullHttpChannel.cpp @@ -82,6 +82,12 @@ 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 75ec2c7..0de0676 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(c5a4a073-4539-49c7-a3f2-cec3f0619c6c)] +[builtinclass, scriptable, uuid(e0d8071b-5389-48c2-92c7-6708c968044d)] interface nsIHttpChannel : nsIChannel { /************************************************************************** @@ -469,4 +469,11 @@ 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 9ed71c4..9f9b894 100644 --- a/netwerk/protocol/viewsource/nsViewSourceChannel.cpp +++ b/netwerk/protocol/viewsource/nsViewSourceChannel.cpp @@ -740,6 +740,17 @@ 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 dfaa218..4c25ae2 100644 --- a/uriloader/exthandler/nsExternalHelperAppService.cpp +++ b/uriloader/exthandler/nsExternalHelperAppService.cpp @@ -106,6 +106,7 @@ #include "mozilla/Preferences.h" #include "mozilla/ipc/URIUtils.h" +#include "mozilla/Unused.h" using namespace mozilla; using namespace mozilla::ipc; @@ -731,14 +732,6 @@ NS_IMETHODIMP nsExternalHelperAppService::DoContent(const nsACString& aMimeConte aForceSave, aWindowContext, aStreamListener); } - // Give other modules, including extensions, a chance to cancel. - bool doCancel = false; - nsresult rv = shouldCancel(&doCancel); - NS_ENSURE_SUCCESS(rv, rv); - if (doCancel) { - return NS_ERROR_FAILURE; - } - nsAutoString fileName; nsAutoCString fileExtension; uint32_t reason = nsIHelperAppLauncherDialog::REASON_CANTHANDLE; @@ -775,6 +768,7 @@ NS_IMETHODIMP nsExternalHelperAppService::DoContent(const nsACString& aMimeConte nsAutoCString query; // We only care about the query for HTTP and HTTPS URLs + nsresult rv; bool isHTTP, isHTTPS; rv = uri->SchemeIs("http", &isHTTP); if (NS_FAILED(rv)) { @@ -1675,6 +1669,37 @@ 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

[tor/master] fix two typos in comments
by arma＠torproject.org 22 May '17

22 May '17

commit 0698a0beca8387e2d365fd0cd5801ecc4f910de3 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon May 22 01:43:52 2017 -0400 fix two typos in comments closes ticket 22322 --- src/common/compat.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/compat.h b/src/common/compat.h index 68fad9b..473ad2b 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -414,10 +414,10 @@ struct tm *tor_gmtime_r(const time_t *timep, struct tm *result); #endif #ifndef timercmp -/** Replacement for timersub on platforms that do not have it: returns true +/** Replacement for timercmp on platforms that do not have it: returns true * iff the relational operator "op" makes the expression tv1 op tv2 true. * - * Note that while this definition should work for all boolean opeators, some + * Note that while this definition should work for all boolean operators, some * platforms' native timercmp definitions do not support >=, <=, or ==. So * don't use those. */

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits May 2017