Handle socket errors better while pipelining:

- Treat empty responses the same as a closed socket (recover by retrying without pipelining).
- If we get a socket error on the first request and haven't pipelined any other requests, don't count it as a pipelining failure.

Notably, the first point fixes www.pogo.com, which closes the connection after sending
back the root document. Oddly, it's actually able to pipeline everything else.

BUG=None
TEST=net_unittests and visit www.pogo.com with --enable-http-pipelining


Review URL: http://codereview.chromium.org/9188066

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117776 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 37 insertions, 1 deletions

diff --git a/net/http/http_pipelined_host_impl_unittest.cc b/net/http/http_pipelined_host_impl_unittest.cc
index 28850e4..932bfd5 100644
--- a/net/http/http_pipelined_host_impl_unittest.cc
+++ b/net/http/http_pipelined_host_impl_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -303,6 +303,42 @@ TEST_F(HttpPipelinedHostImplTest, SuccessesLeadToCapable) {
   ClearTestPipeline(pipeline);
 }
 
+TEST_F(HttpPipelinedHostImplTest, IgnoresSocketErrorOnFirstRequest) {
+  SetCapability(PIPELINE_UNKNOWN);
+  MockPipeline* pipeline = AddTestPipeline(1, true, true);
+
+  EXPECT_CALL(delegate_, OnHostDeterminedCapability(host_.get(), _))
+      .Times(0);
+  host_->OnPipelineFeedback(pipeline,
+                            HttpPipelinedConnection::PIPELINE_SOCKET_ERROR);
+
+  EXPECT_CALL(delegate_, OnHostHasAdditionalCapacity(host_.get()))
+      .Times(1);
+  host_->OnPipelineFeedback(pipeline,
+                            HttpPipelinedConnection::OK);
+
+  EXPECT_CALL(delegate_,
+              OnHostDeterminedCapability(host_.get(), PIPELINE_INCAPABLE))
+      .Times(1);
+  host_->OnPipelineFeedback(pipeline,
+                            HttpPipelinedConnection::PIPELINE_SOCKET_ERROR);
+
+  ClearTestPipeline(pipeline);
+}
+
+TEST_F(HttpPipelinedHostImplTest, HeedsSocketErrorOnFirstRequestWithPipeline) {
+  SetCapability(PIPELINE_UNKNOWN);
+  MockPipeline* pipeline = AddTestPipeline(2, true, true);
+
+  EXPECT_CALL(delegate_,
+              OnHostDeterminedCapability(host_.get(), PIPELINE_INCAPABLE))
+      .Times(1);
+  host_->OnPipelineFeedback(pipeline,
+                            HttpPipelinedConnection::PIPELINE_SOCKET_ERROR);
+
+  ClearTestPipeline(pipeline);
+}
+
 }  // anonymous namespace
 
 }  // namespace net