UploadDataStream::Reset should call FillBuf to return...

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/string_util.h"
 #include "base/trace_event.h"
@@ skipping 946 matching lines @@
   // NOTE: we resend a request only if we reused a keep-alive connection.
   // This automatically prevents an infinite resend loop because we'll run
   // out of the cached keep-alive connections eventually.
   if (establishing_tunnel_ ||
       !reused_socket_ ||  // We didn't reuse a keep-alive connection.
       header_buf_len_) {  // We have received some response headers.
     return false;
   }
   connection_.set_socket(NULL);
   connection_.Reset();
+  // There are two reasons we need to clear request_headers_.  1) It contains
+  // the real request headers, but we may need to resend the CONNECT request
+  // first to recreate the SSL tunnel.  2) An empty request_headers_ causes
+  // BuildRequestHeaders to be called, which rewinds request_body_stream_ to
+  // the beginning of request_->upload_data.
+  request_headers_.clear();
   request_headers_bytes_sent_ = 0;
-  if (request_body_stream_.get())
-    request_body_stream_->Reset();
   next_state_ = STATE_INIT_CONNECTION;  // Resend the request.
   return true;
 }
 
 int HttpNetworkTransaction::ReconsiderProxyAfterError(int error) {
   DCHECK(!pac_request_);
 
   // A failure to resolve the hostname or any error related to establishing a
   // TCP connection could be grounds for trying a new proxy configuration.
   //
@@ skipping 114 matching lines @@
     auth_data_[target]->state = AUTH_STATE_NEED_AUTH;
   }
 
   response_.auth_challenge.swap(auth_info);
   auth_handler_[target].reset(auth_handler.release());
 
   return OK;
 }
 
 }  // namespace net