summaryrefslogtreecommitdiffstats
path: root/net/http/http_network_transaction.cc
diff options
context:
space:
mode:
authorSelim Gurun <sgurun@google.com>2011-11-10 18:38:04 -0800
committerSelim Gurun <sgurun@google.com>2011-11-10 18:51:24 -0800
commit2c4085b2006233b5e3a3fe507d62642377b5dc2e (patch)
treea2b9da4aec8d05b0c6566d4b4edae4764184fdad /net/http/http_network_transaction.cc
parentb54fbb0d9cf6451f1683823838b6c0d2b345ed4b (diff)
downloadexternal_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/http/http_network_transaction.cc')
-rw-r--r--net/http/http_network_transaction.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc
index 55330e2..7f0ac4f 100644
--- a/net/http/http_network_transaction.cc
+++ b/net/http/http_network_transaction.cc
@@ -1203,7 +1203,11 @@ int HttpNetworkTransaction::HandleIOError(int error) {
if (ShouldResendRequest(error)) {
ResetConnectionAndRequestForResend();
error = OK;
- }
+ }
+ break;
+ case ERR_SPDY_PING_FAILED:
+ ResetConnectionAndRequestForResend();
+ error = OK;
break;
}
return error;