- tor-commits - lists.torproject.org

[torbrowser/maint-2.2] bump all tbbs for firefox 12
by erinn＠torproject.org 27 Apr '12

27 Apr '12

commit 7945762f80c94e8e2ee611e0e5c1b76fc113cd41 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Apr 27 13:34:27 2012 -0300 bump all tbbs for firefox 12 --- README.LINUX-2.2 | 10 +++++----- README.OSX-2.2 | 10 +++++----- README.WIN-2.2 | 10 +++++----- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 6 +++--- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 16 ++++++++++++++++ changelog.osx-2.2 | 19 +++++++++++++++++++ changelog.windows-2.2 | 16 ++++++++++++++++ 10 files changed, 72 insertions(+), 21 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index beef2e1..f6b803a 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -4,12 +4,12 @@ Tor Browser Bundle for GNU/Linux Included applications --------------------- -Vidalia 0.2.17 (with Qt 4.7.4) -Tor 0.2.2.35 (with libevent-2.0.17-stable, zlib-1.2.6 and openssl-1.0.0h) -Firefox 11.0 +Vidalia 0.2.17 (with Qt 4.8.1) +Tor 0.2.2.35 (with libevent-2.0.18-stable, zlib-1.2.6 and openssl-1.0.1b) +Firefox 12.0 \_ Torbutton 1.4.5.1 - |_ NoScript 2.3.4 - |_ HTTPS-Everywhere 2.0.1 + |_ NoScript 2.3.9 + |_ HTTPS-Everywhere 2.0.2 Usage ----- diff --git a/README.OSX-2.2 b/README.OSX-2.2 index 01fdcf6..ccb11c1 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -4,12 +4,12 @@ Tor Browser Bundle for Mac OS X Included applications --------------------- -Vidalia 0.2.17 (with Qt 4.7.4) -Tor 0.2.2.35 (with libevent-2.0.17-stable, zlib-1.2.6 and openssl-1.0.0h) -Firefox 11.0 +Vidalia 0.2.17 (with Qt 4.8.1) +Tor 0.2.2.35 (with libevent-2.0.18-stable, zlib-1.2.6 and openssl-1.0.1b) +Firefox 12.0 \_ Torbutton 1.4.5.1 - |_ NoScript 2.3.4 - |_ HTTPS-Everywhere 2.0.1 + |_ NoScript 2.3.9 + |_ HTTPS-Everywhere 2.0.2 Usage ----- diff --git a/README.WIN-2.2 b/README.WIN-2.2 index d2516ac..bb9c1b8 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -4,12 +4,12 @@ Tor Browser Bundle for Windows Included applications --------------------- -Vidalia 0.2.17 (with Qt 4.7.4) -Tor 0.2.2.35 (with libevent-2.0.17-stable, zlib-1.2.6 and openssl-1.0.0h) -Firefox 11.0 +Vidalia 0.2.17 (with Qt 4.8.1) +Tor 0.2.2.35 (with libevent-2.0.18-stable, zlib-1.2.6 and openssl-1.0.1b) +Firefox 12.0 \_ Torbutton 1.4.5.1 - |_ NoScript 2.3.4 - |_ HTTPS-Everywhere 2.0.1 + |_ NoScript 2.3.9 + |_ HTTPS-Everywhere 2.0.2 Usage ----- diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index dec0294..86adbc5 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=9 +BUILD_NUM=10 PLATFORM=Linux ## Build machine specific settings diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index d7af26c..bbefe9a 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=i386 -BUILD_NUM=8 +BUILD_NUM=9 PLATFORM=MacOS ## Set OSX-specific backwards compatibility options diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index e5afa00..aeebee7 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -7,15 +7,15 @@ OPENSSL_VER=1.0.1b LIBPNG_VER=1.5.10 QT_VER=4.8.1 VIDALIA_VER=0.2.17 -LIBEVENT_VER=2.0.17-stable +LIBEVENT_VER=2.0.18-stable TOR_VER=0.2.2.35 PIDGIN_VER=2.6.4 FIREFOX_VER=12.0 MOZBUILD_VER=1.5.1 PYMAKE_VER=87d436cd8974 TORBUTTON_VER=1.4.5.1 -NOSCRIPT_VER=2.3.4 -HTTPSEVERYWHERE_VER=2.0.1 +NOSCRIPT_VER=2.3.9 +HTTPSEVERYWHERE_VER=2.0.2 OTR_VER=3.2.0 OBFSPROXY_VER=0.1.1 diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 26075ca..200d6d2 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -13,7 +13,7 @@ ### Configuration ### ##################### -BUILD_NUM=8 +BUILD_NUM=9 PLATFORM=Windows ## Location of required libraries diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index 9adf7aa..7dcf7ef 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,19 @@ +Tor Browser Bundle (2.2.35-10); suite=linux + + * Update Firefox to 12.0 + * Update OpenSSL to 1.0.1b + * Update Libevent to 2.0.18-stable + * Update Qt to 4.8.1 + * Update Libpng to 1.5.10 + * Update HTTPS Everywhere to 2.0.2 + * Update NoScript to 2.3.9 + * Rebrand Firefox to TorBrowser (closes: #2176) + * New Firefox patches + - Make Download Manager memory-only (closes: #4017) + - Add DuckDuckGo and Startpage to Omnibox (closes: #4902) + + -- Erinn Clark <erinn(a)torproject.org> Fri Apr 27 12:43:35 BRT 2012 + Tor Browser Bundle (2.2.35-9); suite=linux * Fix launch script to prevent Vidalia from running in debug mode all the diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index ab5f160..667e890 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,22 @@ +Tor Browser Bundle (2.2.35-9); suite=osx + + * Update Firefox to 12.0 + * Update OpenSSL to 1.0.1b + * Update Libevent to 2.0.18-stable + * Update Qt to 4.8.1 + * Update Libpng to 1.5.10 + * Update HTTPS Everywhere to 2.0.2 + * Update NoScript to 2.3.9 + * Rebrand Firefox to TorBrowser (closes: #2176) + * New Firefox patches + - Make Download Manager memory-only (closes: #4017) + - Add DuckDuckGo and Startpage to Omnibox (closes: #4902) + - Add Steven Michaud's OS X crash fix patch. It doesn't fix #5021 but will + hopefully help us debug further. See also: + https://bugzilla.mozilla.org/show_bug.cgi?id=715885#c35 + + -- Erinn Clark <erinn(a)torproject.org> Fri Apr 27 12:43:23 BRT 2012 + Tor Browser Bundle (2.2.35-8); suite=osx * Update Firefox to 11.0 diff --git a/changelog.windows-2.2 b/changelog.windows-2.2 index 4f015fb..13cf36f 100644 --- a/changelog.windows-2.2 +++ b/changelog.windows-2.2 @@ -1,3 +1,19 @@ +Tor Browser Bundle (2.2.35-9); suite=windows + + * Update Firefox to 12.0 + * Update OpenSSL to 1.0.1b + * Update Libevent to 2.0.18-stable + * Update Qt to 4.8.1 + * Update Libpng to 1.5.10 + * Update HTTPS Everywhere to 2.0.2 + * Update NoScript to 2.3.9 + * Rebrand Firefox to TorBrowser (closes: #2176) + * New Firefox patches + - Make Download Manager memory-only (closes: #4017) + - Add DuckDuckGo and Startpage to Omnibox (closes: #4902) + + -- Erinn Clark <erinn(a)torproject.org> Fri Apr 27 12:43:33 BRT 2012 + Tor Browser Bundle (2.2.35-8); suite=windows * Update Firefox to 11.0

1 0

[torbrowser/maint-2.3] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 27 Apr '12

27 Apr '12

commit 0c4d7fc9d5dcb3d2e5c7053b4e4b0d8098a4f4e4 Merge: d4b7a1f 7945762 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Apr 27 13:34:56 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 README.LINUX-2.2 | 10 +++++----- README.OSX-2.2 | 10 +++++----- README.WIN-2.2 | 10 +++++----- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 6 +++--- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 16 ++++++++++++++++ changelog.osx-2.2 | 19 +++++++++++++++++++ changelog.windows-2.2 | 16 ++++++++++++++++ 10 files changed, 72 insertions(+), 21 deletions(-)

1 0

[torbrowser/maint-2.3] bump all tbbs for firefox 12
by erinn＠torproject.org 27 Apr '12

27 Apr '12

commit 7945762f80c94e8e2ee611e0e5c1b76fc113cd41 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Apr 27 13:34:27 2012 -0300 bump all tbbs for firefox 12 --- README.LINUX-2.2 | 10 +++++----- README.OSX-2.2 | 10 +++++----- README.WIN-2.2 | 10 +++++----- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 6 +++--- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 16 ++++++++++++++++ changelog.osx-2.2 | 19 +++++++++++++++++++ changelog.windows-2.2 | 16 ++++++++++++++++ 10 files changed, 72 insertions(+), 21 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index beef2e1..f6b803a 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -4,12 +4,12 @@ Tor Browser Bundle for GNU/Linux Included applications --------------------- -Vidalia 0.2.17 (with Qt 4.7.4) -Tor 0.2.2.35 (with libevent-2.0.17-stable, zlib-1.2.6 and openssl-1.0.0h) -Firefox 11.0 +Vidalia 0.2.17 (with Qt 4.8.1) +Tor 0.2.2.35 (with libevent-2.0.18-stable, zlib-1.2.6 and openssl-1.0.1b) +Firefox 12.0 \_ Torbutton 1.4.5.1 - |_ NoScript 2.3.4 - |_ HTTPS-Everywhere 2.0.1 + |_ NoScript 2.3.9 + |_ HTTPS-Everywhere 2.0.2 Usage ----- diff --git a/README.OSX-2.2 b/README.OSX-2.2 index 01fdcf6..ccb11c1 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -4,12 +4,12 @@ Tor Browser Bundle for Mac OS X Included applications --------------------- -Vidalia 0.2.17 (with Qt 4.7.4) -Tor 0.2.2.35 (with libevent-2.0.17-stable, zlib-1.2.6 and openssl-1.0.0h) -Firefox 11.0 +Vidalia 0.2.17 (with Qt 4.8.1) +Tor 0.2.2.35 (with libevent-2.0.18-stable, zlib-1.2.6 and openssl-1.0.1b) +Firefox 12.0 \_ Torbutton 1.4.5.1 - |_ NoScript 2.3.4 - |_ HTTPS-Everywhere 2.0.1 + |_ NoScript 2.3.9 + |_ HTTPS-Everywhere 2.0.2 Usage ----- diff --git a/README.WIN-2.2 b/README.WIN-2.2 index d2516ac..bb9c1b8 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -4,12 +4,12 @@ Tor Browser Bundle for Windows Included applications --------------------- -Vidalia 0.2.17 (with Qt 4.7.4) -Tor 0.2.2.35 (with libevent-2.0.17-stable, zlib-1.2.6 and openssl-1.0.0h) -Firefox 11.0 +Vidalia 0.2.17 (with Qt 4.8.1) +Tor 0.2.2.35 (with libevent-2.0.18-stable, zlib-1.2.6 and openssl-1.0.1b) +Firefox 12.0 \_ Torbutton 1.4.5.1 - |_ NoScript 2.3.4 - |_ HTTPS-Everywhere 2.0.1 + |_ NoScript 2.3.9 + |_ HTTPS-Everywhere 2.0.2 Usage ----- diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index dec0294..86adbc5 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=9 +BUILD_NUM=10 PLATFORM=Linux ## Build machine specific settings diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index d7af26c..bbefe9a 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=i386 -BUILD_NUM=8 +BUILD_NUM=9 PLATFORM=MacOS ## Set OSX-specific backwards compatibility options diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index e5afa00..aeebee7 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -7,15 +7,15 @@ OPENSSL_VER=1.0.1b LIBPNG_VER=1.5.10 QT_VER=4.8.1 VIDALIA_VER=0.2.17 -LIBEVENT_VER=2.0.17-stable +LIBEVENT_VER=2.0.18-stable TOR_VER=0.2.2.35 PIDGIN_VER=2.6.4 FIREFOX_VER=12.0 MOZBUILD_VER=1.5.1 PYMAKE_VER=87d436cd8974 TORBUTTON_VER=1.4.5.1 -NOSCRIPT_VER=2.3.4 -HTTPSEVERYWHERE_VER=2.0.1 +NOSCRIPT_VER=2.3.9 +HTTPSEVERYWHERE_VER=2.0.2 OTR_VER=3.2.0 OBFSPROXY_VER=0.1.1 diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 26075ca..200d6d2 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -13,7 +13,7 @@ ### Configuration ### ##################### -BUILD_NUM=8 +BUILD_NUM=9 PLATFORM=Windows ## Location of required libraries diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index 9adf7aa..7dcf7ef 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,19 @@ +Tor Browser Bundle (2.2.35-10); suite=linux + + * Update Firefox to 12.0 + * Update OpenSSL to 1.0.1b + * Update Libevent to 2.0.18-stable + * Update Qt to 4.8.1 + * Update Libpng to 1.5.10 + * Update HTTPS Everywhere to 2.0.2 + * Update NoScript to 2.3.9 + * Rebrand Firefox to TorBrowser (closes: #2176) + * New Firefox patches + - Make Download Manager memory-only (closes: #4017) + - Add DuckDuckGo and Startpage to Omnibox (closes: #4902) + + -- Erinn Clark <erinn(a)torproject.org> Fri Apr 27 12:43:35 BRT 2012 + Tor Browser Bundle (2.2.35-9); suite=linux * Fix launch script to prevent Vidalia from running in debug mode all the diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index ab5f160..667e890 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,22 @@ +Tor Browser Bundle (2.2.35-9); suite=osx + + * Update Firefox to 12.0 + * Update OpenSSL to 1.0.1b + * Update Libevent to 2.0.18-stable + * Update Qt to 4.8.1 + * Update Libpng to 1.5.10 + * Update HTTPS Everywhere to 2.0.2 + * Update NoScript to 2.3.9 + * Rebrand Firefox to TorBrowser (closes: #2176) + * New Firefox patches + - Make Download Manager memory-only (closes: #4017) + - Add DuckDuckGo and Startpage to Omnibox (closes: #4902) + - Add Steven Michaud's OS X crash fix patch. It doesn't fix #5021 but will + hopefully help us debug further. See also: + https://bugzilla.mozilla.org/show_bug.cgi?id=715885#c35 + + -- Erinn Clark <erinn(a)torproject.org> Fri Apr 27 12:43:23 BRT 2012 + Tor Browser Bundle (2.2.35-8); suite=osx * Update Firefox to 11.0 diff --git a/changelog.windows-2.2 b/changelog.windows-2.2 index 4f015fb..13cf36f 100644 --- a/changelog.windows-2.2 +++ b/changelog.windows-2.2 @@ -1,3 +1,19 @@ +Tor Browser Bundle (2.2.35-9); suite=windows + + * Update Firefox to 12.0 + * Update OpenSSL to 1.0.1b + * Update Libevent to 2.0.18-stable + * Update Qt to 4.8.1 + * Update Libpng to 1.5.10 + * Update HTTPS Everywhere to 2.0.2 + * Update NoScript to 2.3.9 + * Rebrand Firefox to TorBrowser (closes: #2176) + * New Firefox patches + - Make Download Manager memory-only (closes: #4017) + - Add DuckDuckGo and Startpage to Omnibox (closes: #4902) + + -- Erinn Clark <erinn(a)torproject.org> Fri Apr 27 12:43:33 BRT 2012 + Tor Browser Bundle (2.2.35-8); suite=windows * Update Firefox to 11.0

1 0

[torbrowser/master] Fix capitalization of PRUint32
by erinn＠torproject.org 27 Apr '12

27 Apr '12

commit 25858079975fd3757b3524b559e1cbae52239530 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Apr 27 16:02:04 2012 +0200 Fix capitalization of PRUint32 --- ...ize-HTTP-request-order-and-pipeline-depth.patch | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/current-patches/firefox/0012-Randomize-HTTP-request-order-and-pipeline-depth.patch b/src/current-patches/firefox/0012-Randomize-HTTP-request-order-and-pipeline-depth.patch index 684b1e6..33ff9a2 100644 --- a/src/current-patches/firefox/0012-Randomize-HTTP-request-order-and-pipeline-depth.patch +++ b/src/current-patches/firefox/0012-Randomize-HTTP-request-order-and-pipeline-depth.patch @@ -69,7 +69,7 @@ index 6e1099d..3eec5b3 100644 nsHttpConnection *conn = nsnull; - for (i = 0; i < count; ++i) { + -+ PRUInt32* ind = new PRUInt32[count]; ++ PRUint32* ind = new PRUint32[count]; + ShuffleRequestOrder(ind, count); + + for (h=0; h<count; ++h) {

1 0

[torbrowser/maint-2.3] Fix capitalization of PRUint32
by erinn＠torproject.org 27 Apr '12

27 Apr '12

commit 25858079975fd3757b3524b559e1cbae52239530 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Apr 27 16:02:04 2012 +0200 Fix capitalization of PRUint32 --- ...ize-HTTP-request-order-and-pipeline-depth.patch | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/current-patches/firefox/0012-Randomize-HTTP-request-order-and-pipeline-depth.patch b/src/current-patches/firefox/0012-Randomize-HTTP-request-order-and-pipeline-depth.patch index 684b1e6..33ff9a2 100644 --- a/src/current-patches/firefox/0012-Randomize-HTTP-request-order-and-pipeline-depth.patch +++ b/src/current-patches/firefox/0012-Randomize-HTTP-request-order-and-pipeline-depth.patch @@ -69,7 +69,7 @@ index 6e1099d..3eec5b3 100644 nsHttpConnection *conn = nsnull; - for (i = 0; i < count; ++i) { + -+ PRUInt32* ind = new PRUInt32[count]; ++ PRUint32* ind = new PRUint32[count]; + ShuffleRequestOrder(ind, count); + + for (h=0; h<count; ++h) {

1 0

[torbrowser/maint-2.2] Fix capitalization of PRUint32
by erinn＠torproject.org 27 Apr '12

27 Apr '12

commit 25858079975fd3757b3524b559e1cbae52239530 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Apr 27 16:02:04 2012 +0200 Fix capitalization of PRUint32 --- ...ize-HTTP-request-order-and-pipeline-depth.patch | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/current-patches/firefox/0012-Randomize-HTTP-request-order-and-pipeline-depth.patch b/src/current-patches/firefox/0012-Randomize-HTTP-request-order-and-pipeline-depth.patch index 684b1e6..33ff9a2 100644 --- a/src/current-patches/firefox/0012-Randomize-HTTP-request-order-and-pipeline-depth.patch +++ b/src/current-patches/firefox/0012-Randomize-HTTP-request-order-and-pipeline-depth.patch @@ -69,7 +69,7 @@ index 6e1099d..3eec5b3 100644 nsHttpConnection *conn = nsnull; - for (i = 0; i < count; ++i) { + -+ PRUInt32* ind = new PRUInt32[count]; ++ PRUint32* ind = new PRUint32[count]; + ShuffleRequestOrder(ind, count); + + for (h=0; h<count; ++h) {

1 0

[torbrowser/maint-2.3] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 27 Apr '12

27 Apr '12

commit d4b7a1f7f238be0b56729ba062b6861b81196f05 Merge: 1344c9c 2585807 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Apr 27 12:09:18 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 ...ize-HTTP-request-order-and-pipeline-depth.patch | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

1 0

[torbrowser/master] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 27 Apr '12

27 Apr '12

commit d4b7a1f7f238be0b56729ba062b6861b81196f05 Merge: 1344c9c 2585807 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Apr 27 12:09:18 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 ...ize-HTTP-request-order-and-pipeline-depth.patch | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

1 0

[torbrowser/master] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 27 Apr '12

27 Apr '12

commit 1344c9c6e824c19de3bf9fb1949aac615559a152 Merge: bb64a64 4a4879a Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Apr 27 10:50:05 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 ...ize-HTTP-request-order-and-pipeline-depth.patch | 21 ++++++++++++++++++- 1 files changed, 19 insertions(+), 2 deletions(-)

1 0

[torbrowser/maint-2.3] Win: Fix the http pipeline patch so it compiles
by erinn＠torproject.org 27 Apr '12

27 Apr '12

commit 4a4879a1a95896d96acb0eabedd3f746526ee356 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Apr 27 15:43:56 2012 +0200 Win: Fix the http pipeline patch so it compiles --- ...ize-HTTP-request-order-and-pipeline-depth.patch | 21 ++++++++++++++++++- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/current-patches/firefox/0012-Randomize-HTTP-request-order-and-pipeline-depth.patch b/src/current-patches/firefox/0012-Randomize-HTTP-request-order-and-pipeline-depth.patch index 0615abd..684b1e6 100644 --- a/src/current-patches/firefox/0012-Randomize-HTTP-request-order-and-pipeline-depth.patch +++ b/src/current-patches/firefox/0012-Randomize-HTTP-request-order-and-pipeline-depth.patch @@ -40,7 +40,7 @@ index 6e1099d..3eec5b3 100644 - PRInt32 i, count = ent->mPendingQ.Length(); - for (i=0; i<count; ++i) { + PRInt32 i, h, count = ent->mPendingQ.Length(); -+ PRInt32 ind[count]; ++ PRInt32* ind = new PRInt32[count]; + ShuffleRequestOrder((PRUint32*)ind, (PRUint32)count); + + for (h=0; h<count; ++h) { @@ -48,6 +48,15 @@ index 6e1099d..3eec5b3 100644 nsHttpTransaction *trans = ent->mPendingQ[i]; if (trans->Caps() & NS_HTTP_ALLOW_PIPELINING) { pipeline->AddTransaction(trans); +@@ -365,6 +375,8 @@ + break; + } + } ++ ++ delete [] ind; + } + } + } @@ -898,12 +908,17 @@ nsHttpConnectionMgr::ProcessPendingQForEntry(nsConnectionEntry *ent) ProcessSpdyPendingQ(ent); @@ -60,7 +69,7 @@ index 6e1099d..3eec5b3 100644 nsHttpConnection *conn = nsnull; - for (i = 0; i < count; ++i) { + -+ PRUint32 ind[count]; ++ PRUInt32* ind = new PRUInt32[count]; + ShuffleRequestOrder(ind, count); + + for (h=0; h<count; ++h) { @@ -68,6 +77,14 @@ index 6e1099d..3eec5b3 100644 trans = ent->mPendingQ[i]; // When this transaction has already established a half-open +@@ -927,6 +944,7 @@ + "something mutated pending queue from " + "GetConnection()"); + } ++ delete [] ind; + if (conn) { + LOG((" dispatching pending transaction...\n")); + @@ -1011,6 +1026,19 @@ nsHttpConnectionMgr::AtActiveConnectionLimit(nsConnectionEntry *ent, PRUint8 cap maxPersistConns = mMaxPersistConnsPerHost; }

1 0