[tor-commits] [tor-messenger-build/master] Add a pointer to trac 19910
arlo at torproject.org
arlo at torproject.org
Mon Oct 10 19:41:22 UTC 2016
commit f14b365993c8544ed22afda0c8ff8b34c516d3a7
Author: Arlo Breault <arlolra at gmail.com>
Date: Mon Oct 10 12:32:56 2016 -0700
Add a pointer to trac 19910
---
...ug-3875-Use-Optimistic-Data-SOCKS-variant.patch | 120 ---------------------
...0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch | 120 +++++++++++++++++++++
.../mozilla/0002-Trac-16475-Block-flash-too.patch | 2 +-
...Avoid-the-need-to-download-the-font-Osaka.patch | 2 +-
...Update-OS-X-toolchain-to-work-with-ESR-45.patch | 2 +-
projects/mozilla/0005-OSX-package-as-tar.bz2.patch | 2 +-
projects/mozilla/0006-Updater-fixups-for-TM.patch | 2 +-
projects/mozilla/config | 2 +-
8 files changed, 126 insertions(+), 126 deletions(-)
diff --git a/projects/mozilla/0001-Revert-Bug-3875-Use-Optimistic-Data-SOCKS-variant.patch b/projects/mozilla/0001-Revert-Bug-3875-Use-Optimistic-Data-SOCKS-variant.patch
deleted file mode 100644
index aec9dcb..0000000
--- a/projects/mozilla/0001-Revert-Bug-3875-Use-Optimistic-Data-SOCKS-variant.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-From 1cc379a50214fb1e782c76c816b9ef6f8e52b6a0 Mon Sep 17 00:00:00 2001
-From: Arlo Breault <arlolra at gmail.com>
-Date: Mon, 10 Oct 2016 10:52:52 -0700
-Subject: [PATCH 1/6] Revert "Bug #3875: Use Optimistic Data SOCKS variant."
-
- * Preventing startls in xmpp.
-
-This reverts commit 9064546a5e54d94054d944dd910a5db3a67032dc.
----
- netwerk/base/nsSocketTransport2.cpp | 43 ++++++++-----------------------------
- netwerk/base/nsSocketTransport2.h | 4 +---
- netwerk/socket/nsSOCKSIOLayer.cpp | 4 +---
- 3 files changed, 11 insertions(+), 40 deletions(-)
-
-diff --git a/netwerk/base/nsSocketTransport2.cpp b/netwerk/base/nsSocketTransport2.cpp
-index c35a587..6a758f9 100644
---- a/netwerk/base/nsSocketTransport2.cpp
-+++ b/netwerk/base/nsSocketTransport2.cpp
-@@ -1887,26 +1887,8 @@ nsSocketTransport::OnSocketReady(PRFileDesc *fd, int16_t outFlags)
- // Update poll timeout in case it was changed
- mPollTimeout = mTimeouts[TIMEOUT_READ_WRITE];
- }
-+ else if (mState == STATE_CONNECTING) {
-
-- // Tor 3875: Use optimistic data with SOCKS.
-- // To accomplish this, two new states were added that are only used with
-- // SOCKS connections:
-- // STATE_SENDINGGET - The SOCKS handshake has proceeded to the
-- // "sent connect" state; now it is okay to
-- // optimistically send some application data (e.g.,
-- // an HTTP GET request).
-- // STATE_SENTGET - Optimistic data has been sent; make a second call
-- // to PR_ConnectContinue() to allow the SOCKS
-- // handshake to finish.
-- else if (mState == STATE_SENDINGGET) {
-- if ((mPollFlags & PR_POLL_WRITE) && (outFlags & ~PR_POLL_READ)) {
-- mOutput.OnSocketReady(NS_OK); // Allow application data to be sent.
-- }
-- mPollTimeout = mTimeouts[TIMEOUT_READ_WRITE];
-- mPollFlags = (PR_POLL_EXCEPT | PR_POLL_READ);
-- mState = STATE_SENTGET; // Wait for SOCKS handshake response.
-- }
-- else if (mState == STATE_CONNECTING || mState == STATE_SENTGET) {
- // We use PRIntervalTime here because we need
- // nsIOService::LastOfflineStateChange time and
- // nsIOService::LastConectivityChange time to be atomic.
-@@ -1926,14 +1908,7 @@ nsSocketTransport::OnSocketReady(PRFileDesc *fd, int16_t outFlags)
- Telemetry::PRCONNECTCONTINUE_BLOCKING_TIME_OFFLINE);
- }
-
-- bool isUsingSocks = mProxyTransparent && !mProxyHost.IsEmpty();
-- if (status == PR_SUCCESS && mState == STATE_CONNECTING) {
-- OnSocketConnected();
-- if (isUsingSocks) {
-- mState = STATE_SENDINGGET;
-- }
-- }
-- else if (status == PR_SUCCESS && mState == STATE_SENTGET) {
-+ if (status == PR_SUCCESS) {
- //
- // we are connected!
- //
-@@ -1960,17 +1935,17 @@ nsSocketTransport::OnSocketReady(PRFileDesc *fd, int16_t outFlags)
- // If the connect is still not ready, then continue polling...
- //
- if ((PR_WOULD_BLOCK_ERROR == code) || (PR_IN_PROGRESS_ERROR == code)) {
-- if (mState != STATE_SENTGET) {
-- // Set up the select flags for connect...
-- mPollFlags = (PR_POLL_EXCEPT | PR_POLL_WRITE);
-- // Update poll timeout in case it was changed
-- mPollTimeout = mTimeouts[TIMEOUT_CONNECT];
-- }
-+ // Set up the select flags for connect...
-+ mPollFlags = (PR_POLL_EXCEPT | PR_POLL_WRITE);
-+ // Update poll timeout in case it was changed
-+ mPollTimeout = mTimeouts[TIMEOUT_CONNECT];
- }
- //
- // The SOCKS proxy rejected our request. Find out why.
- //
-- else if (PR_UNKNOWN_ERROR == code && isUsingSocks) {
-+ else if (PR_UNKNOWN_ERROR == code &&
-+ mProxyTransparent &&
-+ !mProxyHost.IsEmpty()) {
- code = PR_GetOSError();
- mCondition = ErrorAccordingToNSPR(code);
- }
-diff --git a/netwerk/base/nsSocketTransport2.h b/netwerk/base/nsSocketTransport2.h
-index b7fbc76..b508335 100644
---- a/netwerk/base/nsSocketTransport2.h
-+++ b/netwerk/base/nsSocketTransport2.h
-@@ -190,9 +190,7 @@ private:
- STATE_IDLE,
- STATE_RESOLVING,
- STATE_CONNECTING,
-- STATE_TRANSFERRING,
-- STATE_SENDINGGET,
-- STATE_SENTGET
-+ STATE_TRANSFERRING
- };
-
- // Safer way to get and automatically release PRFileDesc objects.
-diff --git a/netwerk/socket/nsSOCKSIOLayer.cpp b/netwerk/socket/nsSOCKSIOLayer.cpp
-index 568c700..1793001 100644
---- a/netwerk/socket/nsSOCKSIOLayer.cpp
-+++ b/netwerk/socket/nsSOCKSIOLayer.cpp
-@@ -79,9 +79,7 @@ public:
- void SetConnectTimeout(PRIntervalTime to);
- PRStatus DoHandshake(PRFileDesc *fd, int16_t oflags = -1);
- int16_t GetPollFlags() const;
-- bool IsConnected() const { return (mState == SOCKS_CONNECTED ||
-- mState == SOCKS5_READ_CONNECT_RESPONSE_TOP); }
--
-+ bool IsConnected() const { return mState == SOCKS_CONNECTED; }
- void ForgetFD() { mFD = nullptr; }
-
- private:
---
-2.10.1
-
diff --git a/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch b/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch
new file mode 100644
index 0000000..9fca0b7
--- /dev/null
+++ b/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch
@@ -0,0 +1,120 @@
+From 1703b578adc3d9e57358e3ad2eee08922a9d93ec Mon Sep 17 00:00:00 2001
+From: Arlo Breault <arlolra at gmail.com>
+Date: Mon, 10 Oct 2016 10:52:52 -0700
+Subject: [PATCH 1/6] Trac 19910: Prevents STARTTLS in XMPP
+
+ * Revert "Bug #3875: Use Optimistic Data SOCKS variant."
+
+This reverts commit 9064546a5e54d94054d944dd910a5db3a67032dc.
+---
+ netwerk/base/nsSocketTransport2.cpp | 43 ++++++++-----------------------------
+ netwerk/base/nsSocketTransport2.h | 4 +---
+ netwerk/socket/nsSOCKSIOLayer.cpp | 4 +---
+ 3 files changed, 11 insertions(+), 40 deletions(-)
+
+diff --git a/netwerk/base/nsSocketTransport2.cpp b/netwerk/base/nsSocketTransport2.cpp
+index c35a587..6a758f9 100644
+--- a/netwerk/base/nsSocketTransport2.cpp
++++ b/netwerk/base/nsSocketTransport2.cpp
+@@ -1887,26 +1887,8 @@ nsSocketTransport::OnSocketReady(PRFileDesc *fd, int16_t outFlags)
+ // Update poll timeout in case it was changed
+ mPollTimeout = mTimeouts[TIMEOUT_READ_WRITE];
+ }
++ else if (mState == STATE_CONNECTING) {
+
+- // Tor 3875: Use optimistic data with SOCKS.
+- // To accomplish this, two new states were added that are only used with
+- // SOCKS connections:
+- // STATE_SENDINGGET - The SOCKS handshake has proceeded to the
+- // "sent connect" state; now it is okay to
+- // optimistically send some application data (e.g.,
+- // an HTTP GET request).
+- // STATE_SENTGET - Optimistic data has been sent; make a second call
+- // to PR_ConnectContinue() to allow the SOCKS
+- // handshake to finish.
+- else if (mState == STATE_SENDINGGET) {
+- if ((mPollFlags & PR_POLL_WRITE) && (outFlags & ~PR_POLL_READ)) {
+- mOutput.OnSocketReady(NS_OK); // Allow application data to be sent.
+- }
+- mPollTimeout = mTimeouts[TIMEOUT_READ_WRITE];
+- mPollFlags = (PR_POLL_EXCEPT | PR_POLL_READ);
+- mState = STATE_SENTGET; // Wait for SOCKS handshake response.
+- }
+- else if (mState == STATE_CONNECTING || mState == STATE_SENTGET) {
+ // We use PRIntervalTime here because we need
+ // nsIOService::LastOfflineStateChange time and
+ // nsIOService::LastConectivityChange time to be atomic.
+@@ -1926,14 +1908,7 @@ nsSocketTransport::OnSocketReady(PRFileDesc *fd, int16_t outFlags)
+ Telemetry::PRCONNECTCONTINUE_BLOCKING_TIME_OFFLINE);
+ }
+
+- bool isUsingSocks = mProxyTransparent && !mProxyHost.IsEmpty();
+- if (status == PR_SUCCESS && mState == STATE_CONNECTING) {
+- OnSocketConnected();
+- if (isUsingSocks) {
+- mState = STATE_SENDINGGET;
+- }
+- }
+- else if (status == PR_SUCCESS && mState == STATE_SENTGET) {
++ if (status == PR_SUCCESS) {
+ //
+ // we are connected!
+ //
+@@ -1960,17 +1935,17 @@ nsSocketTransport::OnSocketReady(PRFileDesc *fd, int16_t outFlags)
+ // If the connect is still not ready, then continue polling...
+ //
+ if ((PR_WOULD_BLOCK_ERROR == code) || (PR_IN_PROGRESS_ERROR == code)) {
+- if (mState != STATE_SENTGET) {
+- // Set up the select flags for connect...
+- mPollFlags = (PR_POLL_EXCEPT | PR_POLL_WRITE);
+- // Update poll timeout in case it was changed
+- mPollTimeout = mTimeouts[TIMEOUT_CONNECT];
+- }
++ // Set up the select flags for connect...
++ mPollFlags = (PR_POLL_EXCEPT | PR_POLL_WRITE);
++ // Update poll timeout in case it was changed
++ mPollTimeout = mTimeouts[TIMEOUT_CONNECT];
+ }
+ //
+ // The SOCKS proxy rejected our request. Find out why.
+ //
+- else if (PR_UNKNOWN_ERROR == code && isUsingSocks) {
++ else if (PR_UNKNOWN_ERROR == code &&
++ mProxyTransparent &&
++ !mProxyHost.IsEmpty()) {
+ code = PR_GetOSError();
+ mCondition = ErrorAccordingToNSPR(code);
+ }
+diff --git a/netwerk/base/nsSocketTransport2.h b/netwerk/base/nsSocketTransport2.h
+index b7fbc76..b508335 100644
+--- a/netwerk/base/nsSocketTransport2.h
++++ b/netwerk/base/nsSocketTransport2.h
+@@ -190,9 +190,7 @@ private:
+ STATE_IDLE,
+ STATE_RESOLVING,
+ STATE_CONNECTING,
+- STATE_TRANSFERRING,
+- STATE_SENDINGGET,
+- STATE_SENTGET
++ STATE_TRANSFERRING
+ };
+
+ // Safer way to get and automatically release PRFileDesc objects.
+diff --git a/netwerk/socket/nsSOCKSIOLayer.cpp b/netwerk/socket/nsSOCKSIOLayer.cpp
+index 568c700..1793001 100644
+--- a/netwerk/socket/nsSOCKSIOLayer.cpp
++++ b/netwerk/socket/nsSOCKSIOLayer.cpp
+@@ -79,9 +79,7 @@ public:
+ void SetConnectTimeout(PRIntervalTime to);
+ PRStatus DoHandshake(PRFileDesc *fd, int16_t oflags = -1);
+ int16_t GetPollFlags() const;
+- bool IsConnected() const { return (mState == SOCKS_CONNECTED ||
+- mState == SOCKS5_READ_CONNECT_RESPONSE_TOP); }
+-
++ bool IsConnected() const { return mState == SOCKS_CONNECTED; }
+ void ForgetFD() { mFD = nullptr; }
+
+ private:
+--
+2.10.1
+
diff --git a/projects/mozilla/0002-Trac-16475-Block-flash-too.patch b/projects/mozilla/0002-Trac-16475-Block-flash-too.patch
index 87b9c2f..8f08ce2 100644
--- a/projects/mozilla/0002-Trac-16475-Block-flash-too.patch
+++ b/projects/mozilla/0002-Trac-16475-Block-flash-too.patch
@@ -1,4 +1,4 @@
-From 564421a3b91847ced2440129eaac234228331a44 Mon Sep 17 00:00:00 2001
+From e9e251b1018bec2c9cdf9e4cac86e26fda087189 Mon Sep 17 00:00:00 2001
From: Arlo Breault <arlolra at gmail.com>
Date: Thu, 6 Oct 2016 20:13:35 -0700
Subject: [PATCH 2/6] Trac 16475: Block flash too
diff --git a/projects/mozilla/0003-Trac-20206-Avoid-the-need-to-download-the-font-Osaka.patch b/projects/mozilla/0003-Trac-20206-Avoid-the-need-to-download-the-font-Osaka.patch
index 5a371d2..d903ceb 100644
--- a/projects/mozilla/0003-Trac-20206-Avoid-the-need-to-download-the-font-Osaka.patch
+++ b/projects/mozilla/0003-Trac-20206-Avoid-the-need-to-download-the-font-Osaka.patch
@@ -1,4 +1,4 @@
-From c95b06f5607c4aacedda924e10d8353e80f33229 Mon Sep 17 00:00:00 2001
+From 2476fa68858572f0be003df27b78579a5bb68a7f Mon Sep 17 00:00:00 2001
From: Jonathan Kew <jkew at mozilla.com>
Date: Sun, 9 Oct 2016 09:18:37 -0700
Subject: [PATCH 3/6] Trac 20206: Avoid the need to download the font Osaka
diff --git a/projects/mozilla/0004-Trac-18331-Update-OS-X-toolchain-to-work-with-ESR-45.patch b/projects/mozilla/0004-Trac-18331-Update-OS-X-toolchain-to-work-with-ESR-45.patch
index 631f582..81a82c3 100644
--- a/projects/mozilla/0004-Trac-18331-Update-OS-X-toolchain-to-work-with-ESR-45.patch
+++ b/projects/mozilla/0004-Trac-18331-Update-OS-X-toolchain-to-work-with-ESR-45.patch
@@ -1,4 +1,4 @@
-From a41fc8423c3f830fd3e005747238b1739074935b Mon Sep 17 00:00:00 2001
+From 504315cc3326902da82e4b1e1980327053a97500 Mon Sep 17 00:00:00 2001
From: Arlo Breault <arlolra at gmail.com>
Date: Wed, 23 Mar 2016 19:52:07 -0700
Subject: [PATCH 4/6] Trac 18331: Update OS X toolchain to work with ESR 45
diff --git a/projects/mozilla/0005-OSX-package-as-tar.bz2.patch b/projects/mozilla/0005-OSX-package-as-tar.bz2.patch
index 931a31f..260ab94 100644
--- a/projects/mozilla/0005-OSX-package-as-tar.bz2.patch
+++ b/projects/mozilla/0005-OSX-package-as-tar.bz2.patch
@@ -1,4 +1,4 @@
-From cee9e0b2124305c1d1da8316d68a282bff7395f7 Mon Sep 17 00:00:00 2001
+From ab2a2be728d371e632d7816f97d399be84034b18 Mon Sep 17 00:00:00 2001
From: Nicolas Vigier <boklm at torproject.org>
Date: Thu, 25 Jun 2015 12:18:43 +0200
Subject: [PATCH 5/6] OSX: package as tar.bz2
diff --git a/projects/mozilla/0006-Updater-fixups-for-TM.patch b/projects/mozilla/0006-Updater-fixups-for-TM.patch
index 2bf43a0..742f3f5 100644
--- a/projects/mozilla/0006-Updater-fixups-for-TM.patch
+++ b/projects/mozilla/0006-Updater-fixups-for-TM.patch
@@ -1,4 +1,4 @@
-From 5b0b66869046fd7fc802b6636c9d89337aa2f7cb Mon Sep 17 00:00:00 2001
+From 57faba03c751bd972776027faf84d798d2438e12 Mon Sep 17 00:00:00 2001
From: Arlo Breault <arlolra at gmail.com>
Date: Sun, 9 Oct 2016 09:34:38 -0700
Subject: [PATCH 6/6] Updater fixups for TM
diff --git a/projects/mozilla/config b/projects/mozilla/config
index 9e0baa4..e7d220f 100644
--- a/projects/mozilla/config
+++ b/projects/mozilla/config
@@ -4,7 +4,7 @@ filename: 'mozilla-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id")
git_url: https://git.torproject.org/tor-browser.git
git_hash: 8b1f07f31cd04fb157bf99a9e2e600b4422f277f
input_files:
- - filename: 0001-Revert-Bug-3875-Use-Optimistic-Data-SOCKS-variant.patch
+ - filename: 0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch
- filename: 0002-Trac-16475-Block-flash-too.patch
- filename: 0003-Trac-20206-Avoid-the-need-to-download-the-font-Osaka.patch
- filename: 0004-Trac-18331-Update-OS-X-toolchain-to-work-with-ESR-45.patch
More information about the tor-commits
mailing list