diff options
| author | Selim Gurun <sgurun@google.com> | 2011-11-10 18:38:04 -0800 |
|---|---|---|
| committer | Selim Gurun <sgurun@google.com> | 2011-11-10 18:51:24 -0800 |
| commit | 2c4085b2006233b5e3a3fe507d62642377b5dc2e (patch) | |
| tree | a2b9da4aec8d05b0c6566d4b4edae4764184fdad /net/base | |
| parent | b54fbb0d9cf6451f1683823838b6c0d2b345ed4b (diff) | |
| download | external_chromium-2c4085b2006233b5e3a3fe507d62642377b5dc2e.zip external_chromium-2c4085b2006233b5e3a3fe507d62642377b5dc2e.tar.gz external_chromium-2c4085b2006233b5e3a3fe507d62642377b5dc2e.tar.bz2 | |
Backport SPDY ping changes from chrome 16.
Bug: 5524112
Backported Chrome 16 changes for SPDY Ping. The Chrome changes
are:
http://codereview.chromium.org/8036016
http://codereview.chromium.org/8230037
http://codereview.chromium.org/8319015
http://codereview.chromium.org/8330002
Also enable the SPDY protocol.
Change-Id: I2c25c19135ec1c75361d51fdbfbbbbb19f0a3098
Signed-off-by: Selim Gurun <sgurun@google.com>
Diffstat (limited to 'net/base')
| -rw-r--r-- | net/base/net_error_list.h | 3 | ||||
| -rw-r--r-- | net/base/net_log_event_type_list.h | 7 | ||||
| -rw-r--r-- | net/base/run_all_unittests.cc | 3 |
3 files changed, 13 insertions, 0 deletions
diff --git a/net/base/net_error_list.h b/net/base/net_error_list.h index 1147267..6cdfa06 100644 --- a/net/base/net_error_list.h +++ b/net/base/net_error_list.h @@ -444,6 +444,9 @@ NET_ERROR(RESPONSE_HEADERS_MULTIPLE_CONTENT_LENGTH, -346) // headers are missing, so we're expecting additional frames to complete them. NET_ERROR(INCOMPLETE_SPDY_HEADERS, -347) +// SPDY server didn't respond to the PING message. +NET_ERROR(SPDY_PING_FAILED, -352) + // The cache does not have the requested entry. NET_ERROR(CACHE_MISS, -400) diff --git a/net/base/net_log_event_type_list.h b/net/base/net_log_event_type_list.h index f9ab1b3..34c4a26 100644 --- a/net/base/net_log_event_type_list.h +++ b/net/base/net_log_event_type_list.h @@ -778,6 +778,13 @@ EVENT_TYPE(SPDY_SESSION_RST_STREAM) // } EVENT_TYPE(SPDY_SESSION_SEND_RST_STREAM) +// Sending of a SPDY PING frame. +// The following parameters are attached: +// { +// "unique_id": <The unique id of the PING message>, +// } +EVENT_TYPE(SPDY_SESSION_PING) + // Receipt of a SPDY GOAWAY frame. // The following parameters are attached: // { diff --git a/net/base/run_all_unittests.cc b/net/base/run_all_unittests.cc index a844354..bcadda0 100644 --- a/net/base/run_all_unittests.cc +++ b/net/base/run_all_unittests.cc @@ -7,14 +7,17 @@ #include "crypto/nss_util.h" #include "net/base/net_test_suite.h" #include "net/socket/client_socket_pool_base.h" +#include "net/spdy/spdy_session.h" using net::internal::ClientSocketPoolBaseHelper; +using net::SpdySession; int main(int argc, char** argv) { // Record histograms, so we can get histograms data in tests. base::StatisticsRecorder recorder; NetTestSuite test_suite(argc, argv); ClientSocketPoolBaseHelper::set_connect_backup_jobs_enabled(false); + SpdySession::set_enable_ping_based_connection_checking(false); #if defined(OS_WIN) // We want to be sure to init NSPR on the main thread. |