Merge r21417 to 172....

net/url_request/url_request.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/url_request/url_request.h"
 
 #include "base/message_loop.h"
 #include "base/process_util.h"
 #include "base/singleton.h"
 #include "base/stats_counters.h"
@@ skipping 232 matching lines @@
   DCHECK(!is_pending_);
   DCHECK(!job_);
 
   job_ = GetJobManager()->CreateJob(this);
   job_->SetExtraRequestHeaders(extra_request_headers_);
 
   if (upload_.get())
     job_->SetUpload(upload_.get());
 
   is_pending_ = true;
+
   response_info_.request_time = Time::Now();
   response_info_.was_cached = false;
 
   // Don't allow errors to be sent from within Start().
   // TODO(brettw) this may cause NotifyDone to be sent synchronously,
   // we probably don't want this: they should be sent asynchronously so
   // the caller does not get reentered.
   job_->Start();
 }
 
@@ skipping 49 matching lines @@
 
   // Once the request fails or is cancelled, read will just return 0 bytes
   // to indicate end of stream.
   if (!status_.is_success()) {
     return true;
   }
 
   return job_->Read(dest, dest_size, bytes_read);
 }
 
+void URLRequest::FollowDeferredRedirect() {
+  DCHECK(job_);
+
+  job_->FollowDeferredRedirect();
+}
+
 void URLRequest::SetAuth(const wstring& username, const wstring& password) {
   DCHECK(job_);
   DCHECK(job_->NeedsAuth());
 
   job_->SetAuth(username, password);
 }
 
 void URLRequest::CancelAuth() {
   DCHECK(job_);
   DCHECK(job_->NeedsAuth());
 
   job_->CancelAuth();
 }
 
 void URLRequest::ContinueDespiteLastError() {
   DCHECK(job_);
 
   job_->ContinueDespiteLastError();
 }
 
 void URLRequest::OrphanJob() {
+  job_->Kill();
   job_->DetachRequest();  // ensures that the job will not call us again
   job_ = NULL;
 }
 
 // static
 std::string URLRequest::StripPostSpecificHeaders(const std::string& headers) {
   // These are headers that may be attached to a POST.
   static const char* const kPostHeaders[] = {
       "content-type",
       "content-length",
@@ skipping 20 matching lines @@
     // following a 302 redirect, normal browsers don't do that.  Instead, they
     // all convert a POST into a GET in response to a 302 and so shall we.  For
     // 307 redirects, browsers preserve the method.  The RFC says to prompt the
     // user to confirm the generation of a new POST request, but IE omits this
     // prompt and so shall we.
     strip_post_specific_headers = method_ == "POST";
     method_ = "GET";
   }
   url_ = location;
   upload_ = NULL;
-  status_ = URLRequestStatus();
   --redirect_limit_;
 
   if (strip_post_specific_headers) {
     // If being switched from POST to GET, must remove headers that were
     // specific to the POST and don't have meaning in GET. For example
     // the inclusion of a multipart Content-Type header in GET can cause
     // problems with some servers:
     // http://code.google.com/p/chromium/issues/detail?id=843
     //
     // TODO(eroman): It would be better if this data was structured into
     // specific fields/flags, rather than a stew of extra headers.
     extra_request_headers_ = StripPostSpecificHeaders(extra_request_headers_);
   }
 
   if (!final_upload_progress_) {
     final_upload_progress_ = job_->GetUploadProgress();
   }
 
+  job_->Kill();
   OrphanJob();
 
+  status_ = URLRequestStatus();
   is_pending_ = false;
   Start();
   return net::OK;
 }
 
 URLRequestContext* URLRequest::context() {
   return context_.get();
 }
 
 void URLRequest::set_context(URLRequestContext* context) {
   context_ = context;
 }
 
 int64 URLRequest::GetExpectedContentSize() const {
   int64 expected_content_size = -1;
   if (job_)
     expected_content_size = job_->expected_content_size();
 
   return expected_content_size;
 }
 
 #ifndef NDEBUG
 
 URLRequestMetrics::~URLRequestMetrics() {
   DLOG_IF(WARNING, object_count != 0) <<
     "Leaking " << object_count << " URLRequest object(s)";
 }
 
 #endif