Merge 22100 - Fix 307 redirects of a POST request to actually send the body a...

net/url_request/url_request.cc

 // Copyright (c) 2006-2009 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 420 matching lines @@
   bool strip_post_specific_headers = false;
   if (http_status_code != 307) {
     // NOTE: Even though RFC 2616 says to preserve the request method when
     // 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";
+    upload_ = NULL;
   }
   url_ = location;
-  upload_ = NULL;
   --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
@@ skipping 37 matching lines @@
 }
 
 #ifndef NDEBUG
 
 URLRequestMetrics::~URLRequestMetrics() {
   DLOG_IF(WARNING, object_count != 0) <<
     "Leaking " << object_count << " URLRequest object(s)";
 }
 
 #endif