April 2013 - tor-commits - lists.torproject.org

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 12 Apr '13

12 Apr '13

commit b47db37607e2de12e9e26c6a5e5ca02d5547d30b Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 12 09:45:18 2013 +0000 Update translations for vidalia --- zh_TW/vidalia_zh_TW.po | 27 ++++++++++++++------------- 1 files changed, 14 insertions(+), 13 deletions(-) diff --git a/zh_TW/vidalia_zh_TW.po b/zh_TW/vidalia_zh_TW.po index fb1c0fb..68a83e7 100644 --- a/zh_TW/vidalia_zh_TW.po +++ b/zh_TW/vidalia_zh_TW.po @@ -1,6 +1,7 @@ # Translators: # Translators: # <chinrur(a)gmail.com>, 2012. +# muraji saori <muraji(a)tormail.org>, 2013. # runasand <runa.sandvik(a)gmail.com>, 2011. # tylerlin <msn(a)tylerlin.com>, 2011. msgid "" @@ -8,8 +9,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2012-12-20 03:40+0000\n" -"Last-Translator: sora8964 <sora8964(a)gmail.com>\n" +"PO-Revision-Date: 2013-04-12 09:44+0000\n" +"Last-Translator: muraji <muraji(a)tormail.org>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1270,7 +1271,7 @@ msgstr "利比亞" msgctxt "CountryInfo" msgid "Maldives" -msgstr "" +msgstr "馬爾代夫" msgctxt "CountryInfo" msgid "Mexico" @@ -1278,7 +1279,7 @@ msgstr "墨西哥" msgctxt "CountryInfo" msgid "Myanmar" -msgstr "" +msgstr "緬甸" msgctxt "CountryInfo" msgid "Taiwan" @@ -1343,7 +1344,7 @@ msgstr "請選擇 Tor 的路徑" msgctxt "GeneralPage" msgid "Select Proxy Executable" -msgstr "" +msgstr "選擇可執行代理伺服器" msgctxt "GeneralPage" msgid "You must specify the name of your Tor executable." @@ -1351,7 +1352,7 @@ msgstr "你必須為你的 Tor 執行檔命名" msgctxt "GeneralPage" msgid "Start Vidalia when my system starts" -msgstr "" +msgstr "開機時執行 Vidalia" msgctxt "GeneralPage" msgid "Browse" @@ -1383,11 +1384,11 @@ msgstr "軟件更新" msgctxt "GeneralPage" msgid "Check for new software updates automatically" -msgstr "" +msgstr "自動檢查軟件更新" msgctxt "GeneralPage" msgid "Check Now" -msgstr "" +msgstr "現在檢查" msgctxt "GraphFrame" msgid "%1 KB/s" @@ -1550,7 +1551,7 @@ msgid "" "Vidalia can open the link you selected in your default Web browser. If your " "browser is not currently configured to use Tor then the request will not be " "anonymous." -msgstr "" +msgstr "Vidalia 可以打開你於預設網絡瀏覽器所選的連結。如果你的瀏覽器目前並未配置使用 Tor，那你的要求將不會匿名。" msgctxt "HelpTextBrowser" msgid "Do you want Vidalia to open the link in your Web browser?" @@ -1564,7 +1565,7 @@ msgctxt "HelpTextBrowser" msgid "" "Vidalia was unable to open the selected link in your Web browser. You can " "still copy the URL and paste it into your browser." -msgstr "" +msgstr "Vidalia 未能打開你在你的瀏覽器中所選擇的連結。你仍可複製該網址然後於瀏覽器中貼上。" msgctxt "HelpTextBrowser" msgid "Error opening help file:" @@ -1716,7 +1717,7 @@ msgstr "啟動網頁瀏覽器時發生錯誤" msgctxt "MainWindow" msgid "Vidalia was unable to start the configured web browser" -msgstr "" +msgstr "Vidalia 無法啟動已初始設定的網絡瀏覽器" msgctxt "MainWindow" msgid "Error starting IM client" @@ -1780,7 +1781,7 @@ msgstr "雜項" msgctxt "MainWindow" msgid "identity mismatch" -msgstr "" +msgstr "身分不一致" msgctxt "MainWindow" msgid "done" @@ -1880,7 +1881,7 @@ msgctxt "MainWindow" msgid "" "The Tor software requires Vidalia to send the contents of an authentication " "cookie, but Vidalia was unable to find one." -msgstr "" +msgstr "Tor 軟件要求 Vidalia 傳輸認證 cookie 的內容，但 Vidalia 未能找到檔案。" msgctxt "MainWindow" msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"

1 0

[tor/master] fix trivial typo
by arma＠torproject.org 12 Apr '13

12 Apr '13

commit 9a4e9b4a808fa93e419bb504624eb668080b4b4d Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Apr 12 04:27:10 2013 -0400 fix trivial typo --- src/or/dirserv.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index e837e4b..be6db64 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -1911,7 +1911,7 @@ router_counts_toward_thresholds(const node_t *node, time_t now, * the Weighted Fractional Uptime history, and use them to set thresholds for * the Stable, Fast, and Guard flags. Update the fields stable_uptime, * stable_mtbf, enough_mtbf_info, guard_wfu, guard_tk, fast_bandwidth, - * guard_bandwidh_including_exits, guard_bandwidth_excluding_exits, + * guard_bandwidth_including_exits, guard_bandwidth_excluding_exits, * total_bandwidth, and total_exit_bandwidth. * * Also, set the is_exit flag of each router appropriately. */

1 0

[tor/master] Avoid busy-looping on WANTREAD within connection_handle_write
by nickm＠torproject.org 12 Apr '13

12 Apr '13

commit 39ac1db60e8b920e1e6b07e08f7f3343960ece79 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 10 19:30:41 2013 -0400 Avoid busy-looping on WANTREAD within connection_handle_write Fix for bug 5650. Also, if we get a WANTREAD while reading while writing, make sure we're reading. --- changes/bug5650 | 5 +++++ src/or/connection.c | 17 ++++++++++++++++- src/or/or.h | 3 +++ 3 files changed, 24 insertions(+), 1 deletions(-) diff --git a/changes/bug5650 b/changes/bug5650 new file mode 100644 index 0000000..401e317 --- /dev/null +++ b/changes/bug5650 @@ -0,0 +1,5 @@ + o Major bugfixes: + - Avoid a bug where our response to TLS renegotation under certain + network conditions could lead to a busy-loop, with 100% CPU + consumption. Fixes bug 5650; bugfix on 0.2.0.16-alpha. + diff --git a/src/or/connection.c b/src/or/connection.c index eac9c4f..e366e0e 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -2825,7 +2825,20 @@ connection_read_to_buf(connection_t *conn, ssize_t *max_to_read, case TOR_TLS_WANTWRITE: connection_start_writing(conn); return 0; - case TOR_TLS_WANTREAD: /* we're already reading */ + case TOR_TLS_WANTREAD: + if (conn->in_connection_handle_write) { + /* We've been invoked from connection_handle_write, because we're + * waiting for a TLS renegotiation, the renegotiation started, and + * SSL_read returned WANTWRITE. But now SSL_read is saying WANTREAD + * again. Stop waiting for write events now, or else we'll + * busy-loop until data arrives for us to read. */ + connection_stop_writing(conn); + if (!connection_is_reading(conn)) + connection_start_reading(conn); + } + /* we're already reading, one hopes */ + result = 0; + break; case TOR_TLS_DONE: /* no data read, so nothing to process */ result = 0; break; /* so we call bucket_decrement below */ @@ -3337,7 +3350,9 @@ connection_handle_write(connection_t *conn, int force) { int res; tor_gettimeofday_cache_clear(); + conn->in_connection_handle_write = 1; res = connection_handle_write_impl(conn, force); + conn->in_connection_handle_write = 0; return res; } diff --git a/src/or/or.h b/src/or/or.h index 51c23d3..6728b86 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -998,6 +998,9 @@ typedef struct connection_t { /** Set to 1 when we're inside connection_flushed_some to keep us from * calling connection_handle_write() recursively. */ unsigned int in_flushed_some:1; + /** True if connection_handle_write is currently running on this connection. + */ + unsigned int in_connection_handle_write:1; /* For linked connections: */

1 0

[tor/master] Merge remote-tracking branch 'public/bug5650_squashed' into maint-0.2.4
by nickm＠torproject.org 12 Apr '13

12 Apr '13

commit 97246a5b6d6c2e25db14e7a82f4a01b876447101 Merge: a1178cd 39ac1db Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 12 01:13:22 2013 -0400 Merge remote-tracking branch 'public/bug5650_squashed' into maint-0.2.4 changes/bug5650 | 5 +++++ src/or/connection.c | 17 ++++++++++++++++- src/or/or.h | 3 +++ 3 files changed, 24 insertions(+), 1 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 12 Apr '13

12 Apr '13

commit 63ab5f4849620cee81c578d231174bf9f846d740 Merge: d39f713 97246a5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 12 01:14:32 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug5650 | 5 +++++ src/or/connection.c | 17 ++++++++++++++++- src/or/or.h | 3 +++ 3 files changed, 24 insertions(+), 1 deletions(-)

1 0

[tor/maint-0.2.4] Merge remote-tracking branch 'public/bug5650_squashed' into maint-0.2.4
by nickm＠torproject.org 12 Apr '13

12 Apr '13

commit 97246a5b6d6c2e25db14e7a82f4a01b876447101 Merge: a1178cd 39ac1db Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 12 01:13:22 2013 -0400 Merge remote-tracking branch 'public/bug5650_squashed' into maint-0.2.4 changes/bug5650 | 5 +++++ src/or/connection.c | 17 ++++++++++++++++- src/or/or.h | 3 +++ 3 files changed, 24 insertions(+), 1 deletions(-)

1 0

[tor/maint-0.2.4] Avoid busy-looping on WANTREAD within connection_handle_write
by nickm＠torproject.org 12 Apr '13

12 Apr '13

commit 39ac1db60e8b920e1e6b07e08f7f3343960ece79 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 10 19:30:41 2013 -0400 Avoid busy-looping on WANTREAD within connection_handle_write Fix for bug 5650. Also, if we get a WANTREAD while reading while writing, make sure we're reading. --- changes/bug5650 | 5 +++++ src/or/connection.c | 17 ++++++++++++++++- src/or/or.h | 3 +++ 3 files changed, 24 insertions(+), 1 deletions(-) diff --git a/changes/bug5650 b/changes/bug5650 new file mode 100644 index 0000000..401e317 --- /dev/null +++ b/changes/bug5650 @@ -0,0 +1,5 @@ + o Major bugfixes: + - Avoid a bug where our response to TLS renegotation under certain + network conditions could lead to a busy-loop, with 100% CPU + consumption. Fixes bug 5650; bugfix on 0.2.0.16-alpha. + diff --git a/src/or/connection.c b/src/or/connection.c index eac9c4f..e366e0e 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -2825,7 +2825,20 @@ connection_read_to_buf(connection_t *conn, ssize_t *max_to_read, case TOR_TLS_WANTWRITE: connection_start_writing(conn); return 0; - case TOR_TLS_WANTREAD: /* we're already reading */ + case TOR_TLS_WANTREAD: + if (conn->in_connection_handle_write) { + /* We've been invoked from connection_handle_write, because we're + * waiting for a TLS renegotiation, the renegotiation started, and + * SSL_read returned WANTWRITE. But now SSL_read is saying WANTREAD + * again. Stop waiting for write events now, or else we'll + * busy-loop until data arrives for us to read. */ + connection_stop_writing(conn); + if (!connection_is_reading(conn)) + connection_start_reading(conn); + } + /* we're already reading, one hopes */ + result = 0; + break; case TOR_TLS_DONE: /* no data read, so nothing to process */ result = 0; break; /* so we call bucket_decrement below */ @@ -3337,7 +3350,9 @@ connection_handle_write(connection_t *conn, int force) { int res; tor_gettimeofday_cache_clear(); + conn->in_connection_handle_write = 1; res = connection_handle_write_impl(conn, force); + conn->in_connection_handle_write = 0; return res; } diff --git a/src/or/or.h b/src/or/or.h index 51c23d3..6728b86 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -998,6 +998,9 @@ typedef struct connection_t { /** Set to 1 when we're inside connection_flushed_some to keep us from * calling connection_handle_write() recursively. */ unsigned int in_flushed_some:1; + /** True if connection_handle_write is currently running on this connection. + */ + unsigned int in_connection_handle_write:1; /* For linked connections: */

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 12 Apr '13

12 Apr '13

commit e2ecffb197efbe14b58afe659dae252eea802858 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 12 03:45:36 2013 +0000 Update translations for vidalia_help --- sv/netview.po | 52 ++++++++++++++++++++++++++-------------------------- 1 files changed, 26 insertions(+), 26 deletions(-) diff --git a/sv/netview.po b/sv/netview.po index ed042db..adc5db5 100644 --- a/sv/netview.po +++ b/sv/netview.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2013-04-09 14:36+0000\n" +"PO-Revision-Date: 2013-04-12 03:45+0000\n" "Last-Translator: cryptohead <cryptohead(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -18,14 +18,14 @@ msgstr "" #. type: Content of: <html><body><h1> #: en/netview.html:16 msgid "Network Viewer" -msgstr "Nätverksöversikt" +msgstr "Nätverkskarta" #. type: Content of: <html><body><p> #: en/netview.html:20 msgid "" "The network viewer lets you see relays in the Tor network and where your " "traffic is going." -msgstr "Nätverksöversikten låter dig se reläer i Tor-nätverket och hur din trafik flyter." +msgstr "Nätverkskartan låter dig se reläer i Tor-nätverket och hur din trafik flyter." #. type: Content of: <html><body> #: en/netview.html:25 @@ -50,12 +50,12 @@ msgstr "" #. type: Content of: <html><body> #: en/netview.html:35 msgid "<a name=\"netmap\"/>" -msgstr "" +msgstr "<a name=\"netmap\"/>" #. type: Content of: <html><body><h3> #: en/netview.html:36 msgid "Network Map" -msgstr "" +msgstr "Nätverkskarta" #. type: Content of: <html><body><p> #: en/netview.html:38 @@ -99,12 +99,12 @@ msgstr "" #. type: Content of: <html><body> #: en/netview.html:66 msgid "<a name=\"relaylist\"/>" -msgstr "" +msgstr "<a name=\"relaylist\"/>" #. type: Content of: <html><body><h3> #: en/netview.html:67 msgid "Relay Status" -msgstr "" +msgstr "Relädetaljer" #. type: Content of: <html><body><p> #: en/netview.html:69 @@ -117,7 +117,7 @@ msgstr "" #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:78 msgid "The relay is offline or simply not responding." -msgstr "" +msgstr "Reläet är inaktivt eller svarar inte." #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:84 @@ -129,22 +129,22 @@ msgstr "" #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:92 msgid "The relay is online, but has shown only minimal throughput." -msgstr "" +msgstr "Reläet är aktivt men visar bara minimal genomströmning." #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:98 msgid "The relay is online and has shown a throughput >= 20 KB/s." -msgstr "" +msgstr "Reläet är aktivt och har en nätverkskapacitet >= 20 KB/s." #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:104 msgid "The relay is online and has shown a throughput >= 60 KB/s." -msgstr "" +msgstr "Reläet är aktivt och har en nätverkskapacitet >= 60 KB/s." #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:110 msgid "The relay is online and has shown a throughput >= 400 KB/s." -msgstr "" +msgstr "Reläet är aktivt och har en nätverkskapacitet >= 400 KB/s." #. type: Content of: <html><body><p> #: en/netview.html:116 @@ -157,12 +157,12 @@ msgstr "" #. type: Content of: <html><body> #: en/netview.html:122 msgid "<a name=\"details\"/>" -msgstr "" +msgstr "<a name=\"details\"/>" #. type: Content of: <html><body><h3> #: en/netview.html:123 msgid "Relay Details" -msgstr "" +msgstr "Relädetaljer" #. type: Content of: <html><body><p> #: en/netview.html:125 @@ -184,65 +184,65 @@ msgstr "" #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:138 msgid "<b>Location</b>" -msgstr "" +msgstr "<b>Plats</b>" #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:139 msgid "The geographic location of this Tor relay." -msgstr "" +msgstr "Den geografiska platsen för det här Tor-reläet." #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:142 msgid "<b>IP Address</b>" -msgstr "" +msgstr "<b>IP Adress</b>" #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:143 msgid "IP address at which this Tor relay can be reached." -msgstr "" +msgstr "IP adressen som Tor-reläet kan nås på." #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:146 msgid "<b>Platform</b>" -msgstr "" +msgstr "<b>Plattform</b>" #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:148 msgid "" "Operating system information and Tor version on which this relay is " "currently running." -msgstr "" +msgstr "Information om operativsystem och Tor-version som körs på det här reläet." #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:153 msgid "<b>Bandwidth</b>" -msgstr "" +msgstr "<b>Bandbredd</b>" #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:155 msgid "" "Estimated maximum amount of bandwidth that the directory relays have seen " "this relay handle recently." -msgstr "" +msgstr "Uppskattad maximal mängd bandbredd som katalog-reläerna anser att det här reläet kan hantera utan problem." #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:160 msgid "<b>Uptime</b>" -msgstr "" +msgstr "<b>Upptid</b>" #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:162 msgid "" "Length of time this relay has been available, which can be used to help " "estimate this relay's stability." -msgstr "" +msgstr "Tid som det här reläet har varit aktivt, detta kan användas som hjälp för att se hur stabilt reläet är." #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:167 msgid "<b>Last Updated</b>" -msgstr "" +msgstr "<b>Senast Uppdaterad</b>" #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:168 msgid "Date this relay's information was last updated." -msgstr "" +msgstr "Datumet då det här reläets information senast uppdaterades."

1 0

[torbrowser/master] Fix the depth check in the pipeline patch.
by mikeperry＠torproject.org 12 Apr '13

12 Apr '13

commit e405e56d178b5d456278921050d4e7ae8e21e51f Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Thu Apr 11 19:43:43 2013 -0700 Fix the depth check in the pipeline patch. Also improve log message. --- ...ize-HTTP-request-order-and-pipeline-depth.patch | 47 ++++++++++---------- 1 files changed, 24 insertions(+), 23 deletions(-) diff --git a/src/current-patches/firefox/0017-Randomize-HTTP-request-order-and-pipeline-depth.patch b/src/current-patches/firefox/0017-Randomize-HTTP-request-order-and-pipeline-depth.patch index f7dab44..a82e429 100644 --- a/src/current-patches/firefox/0017-Randomize-HTTP-request-order-and-pipeline-depth.patch +++ b/src/current-patches/firefox/0017-Randomize-HTTP-request-order-and-pipeline-depth.patch @@ -1,4 +1,4 @@ -From 468117ab9f414332429406e588ad81fa7b3c72fa Mon Sep 17 00:00:00 2001 +From 6043bc14b28d49618e7882707c56b2fac4ada2a9 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue, 4 Dec 2012 17:38:51 -0800 Subject: [PATCH 17/28] Randomize HTTP request order and pipeline depth. @@ -36,15 +36,15 @@ request representation that will allow more requests to be packed inside Tor cells. If you have interest in evaluating SPDY in a study of Website Traffic Fingerprinting, please contact me. --- - netwerk/protocol/http/nsHttpConnectionMgr.cpp | 297 +++++++++++++++++-------- + netwerk/protocol/http/nsHttpConnectionMgr.cpp | 298 +++++++++++++++++-------- netwerk/protocol/http/nsHttpConnectionMgr.h | 15 +- netwerk/protocol/http/nsHttpHandler.h | 2 + - netwerk/protocol/http/nsHttpPipeline.cpp | 62 +++++- + netwerk/protocol/http/nsHttpPipeline.cpp | 62 ++++- netwerk/protocol/http/nsHttpPipeline.h | 3 + - 5 files changed, 281 insertions(+), 98 deletions(-) + 5 files changed, 282 insertions(+), 98 deletions(-) diff --git a/netwerk/protocol/http/nsHttpConnectionMgr.cpp b/netwerk/protocol/http/nsHttpConnectionMgr.cpp -index 133c301..81ea113 100644 +index 133c301..69de433 100644 --- a/netwerk/protocol/http/nsHttpConnectionMgr.cpp +++ b/netwerk/protocol/http/nsHttpConnectionMgr.cpp @@ -20,6 +20,8 @@ @@ -204,11 +204,11 @@ index 133c301..81ea113 100644 + // limit to allow us to try to get there. Don't give + // too much slack, though, or we'll tend to have + // request packages of the same size when we have -+ // many content elements appear. -+ if (maxdepth <= -+ (pipelineDepth - -+ PR_MIN(mMaxOptimisticPipelinedRequests, -+ requestLen + allClasses))) ++ // many content elements appear at once. ++ if (maxdepth + ++ PR_MIN(mMaxOptimisticPipelinedRequests, ++ requestLen + allClasses) ++ <= pipelineDepth) continue; - if (!bestConn || (connLength < bestConnLength)) { @@ -254,22 +254,23 @@ index 133c301..81ea113 100644 activeTrans = bestConn->Transaction(); nsresult rv = activeTrans->AddTransaction(trans); -@@ -1343,6 +1431,14 @@ nsHttpConnectionMgr::AddToShortestPipeline(nsConnectionEntry *ent, +@@ -1343,6 +1431,15 @@ nsHttpConnectionMgr::AddToShortestPipeline(nsConnectionEntry *ent, LOG((" scheduling trans %p on pipeline at position %d\n", trans, trans->PipelinePosition())); +#ifdef WTF_DEBUG + pipeline = activeTrans->QueryPipeline(); -+ fprintf(stderr, "WTF-depth: Added trans to %s of %d/%d/%d/%d pipelines. Request len %d/%d for %s\n", ++ fprintf(stderr, ++ "WTF-depth: Added trans to %s of %d/%d/%d/%d pipelines. Request len %d/%d/%d for %s\n", + type, bestConns.Length(), betterConns.Length(), validConns.Length(), + numPipelines, pipeline->RequestDepth(), activeTrans->PipelineDepth(), -+ ent->mConnInfo->Host()); ++ maxdepth, ent->mConnInfo->Host()); +#endif + if ((ent->PipelineState() == PS_YELLOW) && (trans->PipelinePosition() > 1)) ent->SetYellowConnection(bestConn); return true; -@@ -1403,26 +1499,12 @@ nsHttpConnectionMgr::TryDispatchTransaction(nsConnectionEntry *ent, +@@ -1403,26 +1500,12 @@ nsHttpConnectionMgr::TryDispatchTransaction(nsConnectionEntry *ent, nsHttpTransaction::Classifier classification = trans->Classification(); uint8_t caps = trans->Caps(); @@ -298,7 +299,7 @@ index 133c301..81ea113 100644 // step 0 // look for existing spdy connection - that's always best because it is // essentially pipelining without head of line blocking -@@ -1436,20 +1518,27 @@ nsHttpConnectionMgr::TryDispatchTransaction(nsConnectionEntry *ent, +@@ -1436,20 +1519,27 @@ nsHttpConnectionMgr::TryDispatchTransaction(nsConnectionEntry *ent, } } @@ -338,7 +339,7 @@ index 133c301..81ea113 100644 nsRefPtr<nsHttpConnection> conn; while (!conn && (ent->mIdleConns.Length() > 0)) { conn = ent->mIdleConns[0]; -@@ -1483,21 +1572,8 @@ nsHttpConnectionMgr::TryDispatchTransaction(nsConnectionEntry *ent, +@@ -1483,21 +1573,8 @@ nsHttpConnectionMgr::TryDispatchTransaction(nsConnectionEntry *ent, } } @@ -362,7 +363,7 @@ index 133c301..81ea113 100644 nsresult rv = MakeNewConnection(ent, trans); if (NS_SUCCEEDED(rv)) { // this function returns NOT_AVAILABLE for asynchronous connects -@@ -1510,17 +1586,16 @@ nsHttpConnectionMgr::TryDispatchTransaction(nsConnectionEntry *ent, +@@ -1510,17 +1587,16 @@ nsHttpConnectionMgr::TryDispatchTransaction(nsConnectionEntry *ent, return rv; } } @@ -389,7 +390,7 @@ index 133c301..81ea113 100644 return NS_ERROR_NOT_AVAILABLE; /* queue it */ } -@@ -1590,10 +1665,20 @@ nsHttpConnectionMgr::DispatchAbstractTransaction(nsConnectionEntry *ent, +@@ -1590,10 +1666,20 @@ nsHttpConnectionMgr::DispatchAbstractTransaction(nsConnectionEntry *ent, if (!NS_SUCCEEDED(rv)) return rv; transaction = pipeline; @@ -410,7 +411,7 @@ index 133c301..81ea113 100644 } nsRefPtr<nsConnectionHandle> handle = new nsConnectionHandle(conn); -@@ -1692,27 +1777,15 @@ nsHttpConnectionMgr::ProcessNewTransaction(nsHttpTransaction *trans) +@@ -1692,27 +1778,15 @@ nsHttpConnectionMgr::ProcessNewTransaction(nsHttpTransaction *trans) "Sticky Connection Not In Active List"); trans->SetConnection(nullptr); rv = DispatchTransaction(ent, trans, conn); @@ -441,7 +442,7 @@ index 133c301..81ea113 100644 } -@@ -2311,13 +2384,37 @@ nsHttpConnectionMgr::OnMsgSpeculativeConnect(int32_t, void *param) +@@ -2311,13 +2385,37 @@ nsHttpConnectionMgr::OnMsgSpeculativeConnect(int32_t, void *param) if (preferredEntry) ent = preferredEntry; @@ -480,7 +481,7 @@ index 133c301..81ea113 100644 nsHttpConnectionMgr::nsConnectionHandle::IsPersistent() { return mConn->IsPersistent(); -@@ -2852,9 +2949,13 @@ nsConnectionEntry::nsConnectionEntry(nsHttpConnectionInfo *ci) +@@ -2852,9 +2950,13 @@ nsConnectionEntry::nsConnectionEntry(nsHttpConnectionInfo *ci) { NS_ADDREF(mConnInfo); if (gHttpHandler->GetPipelineAggressive()) { @@ -495,7 +496,7 @@ index 133c301..81ea113 100644 mInitialGreenDepth = mGreenDepth; memset(mPipeliningClassPenalty, 0, sizeof(int16_t) * nsAHttpTransaction::CLASS_MAX); } -@@ -2892,8 +2993,9 @@ nsConnectionEntry::OnPipelineFeedbackInfo( +@@ -2892,8 +2994,9 @@ nsConnectionEntry::OnPipelineFeedbackInfo( LOG(("Transaction completed at pipeline depth of %d. Host = %s\n", depth, mConnInfo->Host())); @@ -507,7 +508,7 @@ index 133c301..81ea113 100644 } nsAHttpTransaction::Classifier classification; -@@ -2921,6 +3023,11 @@ nsConnectionEntry::OnPipelineFeedbackInfo( +@@ -2921,6 +3024,11 @@ nsConnectionEntry::OnPipelineFeedbackInfo( mPipelineState, mConnInfo->Host())); mPipelineState = PS_RED; mPipeliningPenalty = 0;

1 0

[torbrowser/master] Merge branch 'maint-2.4'
by mikeperry＠torproject.org 12 Apr '13

12 Apr '13

commit 4f94c3e5eb130c9c17f0b26718d53a131cf56ccf Merge: 12e20a4 e405e56 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Thu Apr 11 19:45:58 2013 -0700 Merge branch 'maint-2.4' ...ize-HTTP-request-order-and-pipeline-depth.patch | 47 ++++++++++---------- 1 files changed, 24 insertions(+), 23 deletions(-)

1 0