From 2c4085b2006233b5e3a3fe507d62642377b5dc2e Mon Sep 17 00:00:00 2001
From: Selim Gurun <sgurun@google.com>
Date: Thu, 10 Nov 2011 18:38:04 -0800
Subject: 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>
---
 net/http/http_network_transaction.cc | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'net/http/http_network_transaction.cc')

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;
-- 
cgit v1.1