- tor-commits - lists.torproject.org

[tor/release-0.2.3] Fix the remaining instances of nexted SMARTLIST_FOREACH
by arma＠torproject.org 31 Jul '12

31 Jul '12

commit efdf6c711810cfa951741071cb7b67c3a76f2651 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 17 10:41:24 2012 -0400 Fix the remaining instances of nexted SMARTLIST_FOREACH --- changes/smartlist_foreach | 2 ++ src/or/networkstatus.c | 8 ++++---- src/or/rendservice.c | 8 ++++---- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/changes/smartlist_foreach b/changes/smartlist_foreach index d1e3505..0a6c960 100644 --- a/changes/smartlist_foreach +++ b/changes/smartlist_foreach @@ -2,3 +2,5 @@ - Do not allow the body of any SMARTLIST_FOREACH block to exceed 10 lines. Doing so in the past has led to hard-to-debug code. The new style is to use the SMARTLIST_FOREACH_{BEGIN,END} pair. + - Do not allow SMARTLIST_FOREACH blocks to nest. Any nested block + ought to be using SMARTLIST_FOREACH_{BEGIN,END}. diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 1979250..fadaf90 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -128,12 +128,12 @@ networkstatus_reset_download_failures(void) { int i; const smartlist_t *networkstatus_v2_list = networkstatus_get_v2_list(); - SMARTLIST_FOREACH(networkstatus_v2_list, networkstatus_v2_t *, ns, - SMARTLIST_FOREACH(ns->entries, routerstatus_t *, rs, - { + SMARTLIST_FOREACH_BEGIN(networkstatus_v2_list, networkstatus_v2_t *, ns) { + SMARTLIST_FOREACH_BEGIN(ns->entries, routerstatus_t *, rs) { if (!router_get_by_descriptor_digest(rs->descriptor_digest)) rs->need_to_mirror = 1; - }));; + } SMARTLIST_FOREACH_END(rs); + } SMARTLIST_FOREACH_END(ns); for (i=0; i < N_CONSENSUS_FLAVORS; ++i) download_status_reset(&consensus_dl_status[i]); diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 6a51874..6af4778 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -500,16 +500,16 @@ rend_config_services(const or_options_t *options, int validate_only) /* Copy introduction points to new services. */ /* XXXX This is O(n^2), but it's only called on reconfigure, so it's * probably ok? */ - SMARTLIST_FOREACH(rend_service_list, rend_service_t *, new, { - SMARTLIST_FOREACH(old_service_list, rend_service_t *, old, { + SMARTLIST_FOREACH_BEGIN(rend_service_list, rend_service_t *, new) { + SMARTLIST_FOREACH_BEGIN(old_service_list, rend_service_t *, old) { if (!strcmp(old->directory, new->directory)) { smartlist_add_all(new->intro_nodes, old->intro_nodes); smartlist_clear(old->intro_nodes); smartlist_add(surviving_services, old); break; } - }); - }); + } SMARTLIST_FOREACH_END(old); + } SMARTLIST_FOREACH_END(new); /* Close introduction circuits of services we don't serve anymore. */ /* XXXX it would be nicer if we had a nicer abstraction to use here,

1 0

[tor/release-0.2.3] Tweaks to 6400 changes file and docs as suggested by arma
by arma＠torproject.org 31 Jul '12

31 Jul '12

commit 78dec943074c26747abc7a68cd6aec5269100569 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 18 10:12:19 2012 -0400 Tweaks to 6400 changes file and docs as suggested by arma --- changes/smartlist_foreach | 10 ++++++---- src/common/container.h | 24 +++++++++++++++--------- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/changes/smartlist_foreach b/changes/smartlist_foreach index 0a6c960..2fd3a1a 100644 --- a/changes/smartlist_foreach +++ b/changes/smartlist_foreach @@ -1,6 +1,8 @@ o Code simplification and refactoring: - - Do not allow the body of any SMARTLIST_FOREACH block to exceed - 10 lines. Doing so in the past has led to hard-to-debug code. + - Do not use SMARTLIST_FOREACH for any loop whose body exceeds + 10 lines. Doing so in the past has led to hard-to-debug code. The new style is to use the SMARTLIST_FOREACH_{BEGIN,END} pair. - - Do not allow SMARTLIST_FOREACH blocks to nest. Any nested block - ought to be using SMARTLIST_FOREACH_{BEGIN,END}. + Issue 6400. + - Do not nest SMARTLIST_FOREACH blocks within one another. Any + nested block ought to be using SMARTLIST_FOREACH_{BEGIN,END}. + Issue 6400. diff --git a/src/common/container.h b/src/common/container.h index c11c2eb..dab3b83 100644 --- a/src/common/container.h +++ b/src/common/container.h @@ -142,9 +142,9 @@ char *smartlist_join_strings2(smartlist_t *sl, const char *join, /** Iterate over the items in a smartlist sl, in order. For each item, * assign it to a new local variable of type type named var, and - * execute the statement cmd. Inside the loop, the loop index can - * be accessed as var_sl_idx and the length of the list can be accessed - * as var_sl_len. + * execute the statements inside the loop body. Inside the loop, the loop + * index can be accessed as var_sl_idx and the length of the list can + * be accessed as var_sl_len. * * NOTE: Do not change the length of the list while the loop is in progress, * unless you adjust the _sl_len variable correspondingly. See second example @@ -153,23 +153,21 @@ char *smartlist_join_strings2(smartlist_t *sl, const char *join, * Example use: * <pre> * smartlist_t *list = smartlist_split("A:B:C", ":", 0, 0); - * SMARTLIST_FOREACH(list, char *, cp, - * { + * SMARTLIST_FOREACH_BEGIN(list, char *, cp) { * printf("%d: %s\n", cp_sl_idx, cp); * tor_free(cp); - * }); + * } SMARTLIST_FOREACH_END(cp); * smartlist_free(list); * </pre> * * Example use (advanced): * <pre> - * SMARTLIST_FOREACH(list, char *, cp, - * { + * SMARTLIST_FOREACH_BEGIN(list, char *, cp) { * if (!strcmp(cp, "junk")) { * tor_free(cp); * SMARTLIST_DEL_CURRENT(list, cp); * } - * }); + * } SMARTLIST_FOREACH_END(cp); * </pre> */ /* Note: these macros use token pasting, and reach into smartlist internals. @@ -218,6 +216,14 @@ char *smartlist_join_strings2(smartlist_t *sl, const char *join, var = NULL; \ } STMT_END +/** + * An alias for SMARTLIST_FOREACH_BEGIN and SMARTLIST_FOREACH_END, using + * cmd as the loop body. This wrapper is here for convenience with + * very short loops. + * + * By convention, we do not use this for loops which nest, or for loops over + * 10 lines or so. Use SMARTLIST_FOREACH_{BEGIN,END} for those. + */ #define SMARTLIST_FOREACH(sl, type, var, cmd) \ SMARTLIST_FOREACH_BEGIN(sl,type,var) { \ cmd; \

1 0

[tor/release-0.2.3] Improve message on spurious SOCKSListenAddress
by arma＠torproject.org 31 Jul '12

31 Jul '12

commit 4cac5df5548e0051a6927a778da3e6f01f45dc56 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 17 12:02:55 2012 -0400 Improve message on spurious SOCKSListenAddress --- changes/port_doc | 3 +++ src/or/config.c | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/changes/port_doc b/changes/port_doc new file mode 100644 index 0000000..0e8662f --- /dev/null +++ b/changes/port_doc @@ -0,0 +1,3 @@ + o Minor features (usability): + - Try to make the warning when giving an obsolete SOCKSListenAddress + a littel more useful. diff --git a/src/or/config.c b/src/or/config.c index f5b5c8f..bacb06e 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -5642,7 +5642,7 @@ parse_port_config(smartlist_t *out, mainport = (int)tor_parse_long(ports->value, 10, 0, 65535, &ok, NULL); if (!ok) { log_warn(LD_CONFIG, "%sListenAddress can only be used with a single " - "%sPort with value \"auto\" or 1-65535.", + "%sPort with value \"auto\" or 1-65535 and no options set.", portname, portname); return -1; }

1 0

[tor/release-0.2.3] Merge branch 'smartlist_shorten' into maint-0.2.3
by arma＠torproject.org 31 Jul '12

31 Jul '12

commit b355ddb20f534d772dcb42737ceb1d0264e2c3f1 Merge: 4cac5df 78dec94 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 18 10:14:14 2012 -0400 Merge branch 'smartlist_shorten' into maint-0.2.3 changes/smartlist_foreach | 8 +++++ src/common/container.h | 24 ++++++++++------ src/common/log.c | 5 +-- src/or/circuitbuild.c | 14 ++++----- src/or/config.c | 8 ++-- src/or/connection.c | 15 ++++------ src/or/connection_edge.c | 5 +-- src/or/control.c | 24 ++++++--------- src/or/cpuworker.c | 5 +-- src/or/directory.c | 24 ++++++--------- src/or/dirserv.c | 28 ++++++++---------- src/or/dirvote.c | 69 ++++++++++++++++++++------------------------ src/or/geoip.c | 4 +- src/or/main.c | 5 +-- src/or/networkstatus.c | 32 ++++++++++----------- src/or/policies.c | 14 ++++----- src/or/rendservice.c | 8 ++-- src/or/routerlist.c | 53 +++++++++++++++------------------- src/or/routerparse.c | 4 +- src/test/test.c | 5 +-- src/test/test_util.c | 5 +-- 21 files changed, 166 insertions(+), 193 deletions(-)

1 0

[tor/release-0.2.3] Better handling of server managed proxies when Tor is not a relay.
by arma＠torproject.org 31 Jul '12

31 Jul '12

commit a1d060a68f62af3c9813f530eab70ce70d70fd6c Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Jul 18 20:01:02 2012 +0200 Better handling of server managed proxies when Tor is not a relay. --- changes/bug6274 | 3 +++ changes/bug6274_2 | 3 +++ src/or/config.c | 9 ++++++++- 3 files changed, 14 insertions(+), 1 deletions(-) diff --git a/changes/bug6274 b/changes/bug6274 new file mode 100644 index 0000000..ad1abcd --- /dev/null +++ b/changes/bug6274 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Ignore ServerTransportPlugin lines when Tor is not configured as + a relay. Fixes bug 6274; bugfix on 0.2.3.6-alpha. diff --git a/changes/bug6274_2 b/changes/bug6274_2 new file mode 100644 index 0000000..89576f9 --- /dev/null +++ b/changes/bug6274_2 @@ -0,0 +1,3 @@ + o Minor features: + - Terminate active server managed proxies if Tor stops being a + relay. Addresses parts of bug 6274; bugfix on 0.2.3.6-alpha. diff --git a/src/or/config.c b/src/or/config.c index d90e0fc..07da2da 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1464,7 +1464,7 @@ options_act(const or_options_t *old_options) } } - if (options->ServerTransportPlugin) { + if (options->ServerTransportPlugin && server_mode(options)) { for (cl = options->ServerTransportPlugin; cl; cl = cl->next) { if (parse_server_transport_line(cl->value, 0)<0) { log_warn(LD_BUG, @@ -4019,6 +4019,13 @@ options_validate(or_options_t *old_options, or_options_t *options, REJECT("Server transport line did not parse. See logs for details."); } + if (options->ServerTransportPlugin && !server_mode(options)) { + log_notice(LD_GENERAL, "Tor is not configured as a relay but you specified" + " a ServerTransportPlugin line (%s). The ServerTransportPlugin " + "line will be ignored.", + esc_for_log(options->ServerTransportPlugin->value)); + } + if (options->ConstrainedSockets) { /* If the user wants to constrain socket buffer use, make sure the desired * limit is between MIN|MAX_TCPSOCK_BUFFER in k increments. */

1 0

[tor/master] trivial grammar fix
by arma＠torproject.org 31 Jul '12

31 Jul '12

commit 1004489354685e7fe27df7fe7fdb9cc94f2d7d2d Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Jul 31 05:10:05 2012 -0400 trivial grammar fix --- src/or/dns.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/dns.c b/src/or/dns.c index 02447ec..da11668 100644 --- a/src/or/dns.c +++ b/src/or/dns.c @@ -567,7 +567,7 @@ send_resolved_hostname_cell(edge_connection_t *conn, const char *hostname) // log_notice(LD_EXIT, "Sent"); } -/** See if we have a cache entry for exitconn-\>address. if so, +/** See if we have a cache entry for exitconn-\>address. If so, * if resolve valid, put it into exitconn-\>addr and return 1. * If resolve failed, free exitconn and return -1. *

1 0

[tor/master] Merge branch 'maint-0.2.3'
by arma＠torproject.org 31 Jul '12

31 Jul '12

commit 1049d315d7055cb98095001cb5fefae0f40d36de Merge: 08e65ce 1004489 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Jul 31 05:10:23 2012 -0400 Merge branch 'maint-0.2.3' src/or/dns.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

1 0

[tor/maint-0.2.3] trivial grammar fix
by arma＠torproject.org 31 Jul '12

31 Jul '12

commit 1004489354685e7fe27df7fe7fdb9cc94f2d7d2d Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Jul 31 05:10:05 2012 -0400 trivial grammar fix --- src/or/dns.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/dns.c b/src/or/dns.c index 02447ec..da11668 100644 --- a/src/or/dns.c +++ b/src/or/dns.c @@ -567,7 +567,7 @@ send_resolved_hostname_cell(edge_connection_t *conn, const char *hostname) // log_notice(LD_EXIT, "Sent"); } -/** See if we have a cache entry for exitconn-\>address. if so, +/** See if we have a cache entry for exitconn-\>address. If so, * if resolve valid, put it into exitconn-\>addr and return 1. * If resolve failed, free exitconn and return -1. *

1 0

[torbrowser/master] Bug #6492: Fix the Tor Browser SIGFPE crash bug
by mikeperry＠torproject.org 30 Jul '12

30 Jul '12

commit 0087524ee74ece1c5e12838e4f2823335d06679e Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Mon Jul 30 18:48:00 2012 -0700 Bug #6492: Fix the Tor Browser SIGFPE crash bug All reported crashy sites no longer crash for me with this version. --- ...ize-HTTP-request-order-and-pipeline-depth.patch | 26 +++++++++++-------- 1 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/current-patches/firefox/alpha/0017-Randomize-HTTP-request-order-and-pipeline-depth.patch b/src/current-patches/firefox/alpha/0017-Randomize-HTTP-request-order-and-pipeline-depth.patch index 407296e..96df3f7 100644 --- a/src/current-patches/firefox/alpha/0017-Randomize-HTTP-request-order-and-pipeline-depth.patch +++ b/src/current-patches/firefox/alpha/0017-Randomize-HTTP-request-order-and-pipeline-depth.patch @@ -1,7 +1,7 @@ -From 54b2fce6f6dc202de87414d828ef5328f368f1f3 Mon Sep 17 00:00:00 2001 +From 1777a19229cf111156aeae078344a27f34c953c3 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri, 20 Jul 2012 18:13:44 -0700 -Subject: [PATCH 17/19] Randomize HTTP request order and pipeline depth. +Subject: [PATCH 17/21] Randomize HTTP request order and pipeline depth. This is an experimental defense against http://lorre.uni.lu/~andriy/papers/acmccs-wpes11-fingerprinting.pdf @@ -19,12 +19,12 @@ similar behavior... The good news is we now randomize SPDY request order as well as pipeline request order (though SPDY is still disabled by default in TBB). --- - netwerk/protocol/http/nsHttpConnectionMgr.cpp | 54 +++++++++++++++++++++++-- + netwerk/protocol/http/nsHttpConnectionMgr.cpp | 58 +++++++++++++++++++++++-- netwerk/protocol/http/nsHttpConnectionMgr.h | 3 + - 2 files changed, 53 insertions(+), 4 deletions(-) + 2 files changed, 57 insertions(+), 4 deletions(-) diff --git a/netwerk/protocol/http/nsHttpConnectionMgr.cpp b/netwerk/protocol/http/nsHttpConnectionMgr.cpp -index 5336c7d..b20e770 100644 +index 5336c7d..b94ee31 100644 --- a/netwerk/protocol/http/nsHttpConnectionMgr.cpp +++ b/netwerk/protocol/http/nsHttpConnectionMgr.cpp @@ -52,6 +52,8 @@ @@ -36,7 +36,7 @@ index 5336c7d..b20e770 100644 using namespace mozilla; // defined by the socket transport service while active -@@ -70,15 +72,37 @@ InsertTransactionSorted(nsTArray<nsHttpTransaction*> &pendingQ, nsHttpTransactio +@@ -70,15 +72,39 @@ InsertTransactionSorted(nsTArray<nsHttpTransaction*> &pendingQ, nsHttpTransactio // insert into queue with smallest valued number first. search in reverse // order under the assumption that many of the existing transactions will // have the same priority (usually 0). @@ -69,6 +69,8 @@ index 5336c7d..b20e770 100644 + // Choose random destination begin..end + PRInt32 count = 1+end - begin; + ++ if (count == 0) count = 1; // shouldn't happen... ++ + // FIXME: rand() is not crypto-secure.. but meh, this code will probably + // change like 2 dozen more times before merge, and rand() is probably + // good enough for our purposes anyways. @@ -78,7 +80,7 @@ index 5336c7d..b20e770 100644 } //----------------------------------------------------------------------------- -@@ -101,6 +125,12 @@ nsHttpConnectionMgr::nsHttpConnectionMgr() +@@ -101,6 +127,12 @@ nsHttpConnectionMgr::nsHttpConnectionMgr() mCT.Init(); mAlternateProtocolHash.Init(16); mSpdyPreferredHash.Init(); @@ -91,7 +93,7 @@ index 5336c7d..b20e770 100644 } nsHttpConnectionMgr::~nsHttpConnectionMgr() -@@ -1115,6 +1145,19 @@ nsHttpConnectionMgr::AtActiveConnectionLimit(nsConnectionEntry *ent, PRUint8 cap +@@ -1115,6 +1147,19 @@ nsHttpConnectionMgr::AtActiveConnectionLimit(nsConnectionEntry *ent, PRUint8 cap maxPersistConns = mMaxPersistConnsPerHost; } @@ -111,12 +113,14 @@ index 5336c7d..b20e770 100644 // use >= just to be safe bool result = (totalCount >= maxConns) || ( (caps & NS_HTTP_ALLOW_KEEPALIVE) && (persistCount >= maxPersistConns) ); -@@ -1250,6 +1293,9 @@ nsHttpConnectionMgr::AddToShortestPipeline(nsConnectionEntry *ent, +@@ -1250,6 +1295,11 @@ nsHttpConnectionMgr::AddToShortestPipeline(nsConnectionEntry *ent, maxdepth = PR_MIN(maxdepth, depthLimit); -+ // This is a crazy hack to randomize pipeline depth a bit more.. -+ maxdepth = 1 + maxdepth/2 + (rand() % (maxdepth/2)); ++ if (maxdepth/2 > 1) { ++ // This is a crazy hack to randomize pipeline depth a bit more.. ++ maxdepth = 1 + maxdepth/2 + (rand() % (maxdepth/2)); ++ } + if (maxdepth < 2) return false;

1 0

[torbrowser/maint-2.3] Bug #6492: Fix the Tor Browser SIGFPE crash bug
by mikeperry＠torproject.org 30 Jul '12

30 Jul '12

commit 0087524ee74ece1c5e12838e4f2823335d06679e Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Mon Jul 30 18:48:00 2012 -0700 Bug #6492: Fix the Tor Browser SIGFPE crash bug All reported crashy sites no longer crash for me with this version. --- ...ize-HTTP-request-order-and-pipeline-depth.patch | 26 +++++++++++-------- 1 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/current-patches/firefox/alpha/0017-Randomize-HTTP-request-order-and-pipeline-depth.patch b/src/current-patches/firefox/alpha/0017-Randomize-HTTP-request-order-and-pipeline-depth.patch index 407296e..96df3f7 100644 --- a/src/current-patches/firefox/alpha/0017-Randomize-HTTP-request-order-and-pipeline-depth.patch +++ b/src/current-patches/firefox/alpha/0017-Randomize-HTTP-request-order-and-pipeline-depth.patch @@ -1,7 +1,7 @@ -From 54b2fce6f6dc202de87414d828ef5328f368f1f3 Mon Sep 17 00:00:00 2001 +From 1777a19229cf111156aeae078344a27f34c953c3 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri, 20 Jul 2012 18:13:44 -0700 -Subject: [PATCH 17/19] Randomize HTTP request order and pipeline depth. +Subject: [PATCH 17/21] Randomize HTTP request order and pipeline depth. This is an experimental defense against http://lorre.uni.lu/~andriy/papers/acmccs-wpes11-fingerprinting.pdf @@ -19,12 +19,12 @@ similar behavior... The good news is we now randomize SPDY request order as well as pipeline request order (though SPDY is still disabled by default in TBB). --- - netwerk/protocol/http/nsHttpConnectionMgr.cpp | 54 +++++++++++++++++++++++-- + netwerk/protocol/http/nsHttpConnectionMgr.cpp | 58 +++++++++++++++++++++++-- netwerk/protocol/http/nsHttpConnectionMgr.h | 3 + - 2 files changed, 53 insertions(+), 4 deletions(-) + 2 files changed, 57 insertions(+), 4 deletions(-) diff --git a/netwerk/protocol/http/nsHttpConnectionMgr.cpp b/netwerk/protocol/http/nsHttpConnectionMgr.cpp -index 5336c7d..b20e770 100644 +index 5336c7d..b94ee31 100644 --- a/netwerk/protocol/http/nsHttpConnectionMgr.cpp +++ b/netwerk/protocol/http/nsHttpConnectionMgr.cpp @@ -52,6 +52,8 @@ @@ -36,7 +36,7 @@ index 5336c7d..b20e770 100644 using namespace mozilla; // defined by the socket transport service while active -@@ -70,15 +72,37 @@ InsertTransactionSorted(nsTArray<nsHttpTransaction*> &pendingQ, nsHttpTransactio +@@ -70,15 +72,39 @@ InsertTransactionSorted(nsTArray<nsHttpTransaction*> &pendingQ, nsHttpTransactio // insert into queue with smallest valued number first. search in reverse // order under the assumption that many of the existing transactions will // have the same priority (usually 0). @@ -69,6 +69,8 @@ index 5336c7d..b20e770 100644 + // Choose random destination begin..end + PRInt32 count = 1+end - begin; + ++ if (count == 0) count = 1; // shouldn't happen... ++ + // FIXME: rand() is not crypto-secure.. but meh, this code will probably + // change like 2 dozen more times before merge, and rand() is probably + // good enough for our purposes anyways. @@ -78,7 +80,7 @@ index 5336c7d..b20e770 100644 } //----------------------------------------------------------------------------- -@@ -101,6 +125,12 @@ nsHttpConnectionMgr::nsHttpConnectionMgr() +@@ -101,6 +127,12 @@ nsHttpConnectionMgr::nsHttpConnectionMgr() mCT.Init(); mAlternateProtocolHash.Init(16); mSpdyPreferredHash.Init(); @@ -91,7 +93,7 @@ index 5336c7d..b20e770 100644 } nsHttpConnectionMgr::~nsHttpConnectionMgr() -@@ -1115,6 +1145,19 @@ nsHttpConnectionMgr::AtActiveConnectionLimit(nsConnectionEntry *ent, PRUint8 cap +@@ -1115,6 +1147,19 @@ nsHttpConnectionMgr::AtActiveConnectionLimit(nsConnectionEntry *ent, PRUint8 cap maxPersistConns = mMaxPersistConnsPerHost; } @@ -111,12 +113,14 @@ index 5336c7d..b20e770 100644 // use >= just to be safe bool result = (totalCount >= maxConns) || ( (caps & NS_HTTP_ALLOW_KEEPALIVE) && (persistCount >= maxPersistConns) ); -@@ -1250,6 +1293,9 @@ nsHttpConnectionMgr::AddToShortestPipeline(nsConnectionEntry *ent, +@@ -1250,6 +1295,11 @@ nsHttpConnectionMgr::AddToShortestPipeline(nsConnectionEntry *ent, maxdepth = PR_MIN(maxdepth, depthLimit); -+ // This is a crazy hack to randomize pipeline depth a bit more.. -+ maxdepth = 1 + maxdepth/2 + (rand() % (maxdepth/2)); ++ if (maxdepth/2 > 1) { ++ // This is a crazy hack to randomize pipeline depth a bit more.. ++ maxdepth = 1 + maxdepth/2 + (rand() % (maxdepth/2)); ++ } + if (maxdepth < 2) return false;

1 0