Add a boolean data member called_socket_read_ to help...

net/http/http_network_transaction.cc

 // Copyright (c) 2006-2008 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.
 
 #include "net/http/http_network_transaction.h"
 
 #include "base/scoped_ptr.h"
 #include "base/compiler_specific.h"
 #include "base/field_trial.h"
 #include "base/string_util.h"
@@ skipping 31 matching lines @@
       session_(session),
       request_(NULL),
       pac_request_(NULL),
       socket_factory_(csf),
       connection_(session->connection_pool()),
       reused_socket_(false),
       using_ssl_(false),
       using_proxy_(false),
       using_tunnel_(false),
       establishing_tunnel_(false),
+      reading_body_from_socket_(false),
       request_headers_bytes_sent_(0),
       header_buf_capacity_(0),
       header_buf_len_(0),
       header_buf_body_offset_(-1),
       header_buf_http_offset_(-1),
       response_body_length_(-1),  // -1 means unspecified.
       response_body_read_(0),
       read_buf_len_(0),
       next_state_(STATE_NONE) {
 #if defined(OS_WIN)
@@ skipping 763 matching lines @@
     header_buf_body_offset_ += n;
     if (header_buf_body_offset_ == header_buf_len_) {
       header_buf_.reset();
       header_buf_capacity_ = 0;
       header_buf_len_ = 0;
       header_buf_body_offset_ = -1;
     }
     return n;
   }
 
+  reading_body_from_socket_ = true;
   return connection_.socket()->Read(read_buf_->data(), read_buf_len_,
                                     &io_callback_);
 }
 
 int HttpNetworkTransaction::DoReadBodyComplete(int result) {
   // We are done with the Read call.
   DCHECK(!establishing_tunnel_) <<
       "We should never read a response body of a tunnel.";
 
-  bool unfiltered_eof = (result == 0);
+  bool unfiltered_eof = (result == 0 && reading_body_from_socket_);
+  reading_body_from_socket_ = false;
 
   // Filter incoming data if appropriate.  FilterBuf may return an error.
   if (result > 0 && chunked_decoder_.get()) {
     result = chunked_decoder_->FilterBuf(read_buf_->data(), result);
     if (result == 0 && !chunked_decoder_->reached_eof()) {
       // Don't signal completion of the Read call yet or else it'll look like
       // we received end-of-file.  Wait for more data.
       next_state_ = STATE_READ_BODY;
       return OK;
     }
@@ skipping 43 matching lines @@
   int rv = DoReadBody();
   DCHECK(next_state_ == STATE_READ_BODY_COMPLETE);
   next_state_ = STATE_DRAIN_BODY_FOR_AUTH_RESTART_COMPLETE;
   return rv;
 }
 
 // TODO(wtc): The first two thirds of this method and the DoReadBodyComplete
 // method are almost the same.  Figure out a good way for these two methods
 // to share code.
 int HttpNetworkTransaction::DoDrainBodyForAuthRestartComplete(int result) {
-  bool unfiltered_eof = (result == 0);
+  bool unfiltered_eof = (result == 0 && reading_body_from_socket_);
+  reading_body_from_socket_ = false;
 
   // Filter incoming data if appropriate.  FilterBuf may return an error.
   if (result > 0 && chunked_decoder_.get()) {
     result = chunked_decoder_->FilterBuf(read_buf_->data(), result);
     if (result == 0 && !chunked_decoder_->reached_eof()) {
       // Don't signal completion of the Read call yet or else it'll look like
       // we received end-of-file.  Wait for more data.
       next_state_ = STATE_DRAIN_BODY_FOR_AUTH_RESTART;
       return OK;
     }
@@ skipping 609 matching lines @@
   if (target == HttpAuth::AUTH_PROXY) {
     auth_info->host = ASCIIToWide(proxy_info_.proxy_server().host_and_port());
   } else {
     DCHECK(target == HttpAuth::AUTH_SERVER);
     auth_info->host = ASCIIToWide(request_->url.host());
   }
   response_.auth_challenge = auth_info;
 }
 
 }  // namespace net