Fix a logic error in the handling the response to an HTTP...

net/url_request/url_request_http_job.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_http_job.h"
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
@@ skipping 191 matching lines @@
 
 bool URLRequestHttpJob::IsRedirectResponse(GURL* location,
                                            int* http_status_code) {
   if (!response_info_)
     return false;
 
   std::string value;
   if (!response_info_->headers->IsRedirect(&value))
     return false;
 
+  // For HTTPS, if we didn't receive a server certificate, the response was
+  // from the proxy server (a response to the CONNECT request) rather than
+  // the server.
+  if (request_->url().SchemeIsSecure() && !response_info_->ssl_info.cert)
+    return false;
+
   *location = request_->url().Resolve(value);
   *http_status_code = response_info_->headers->response_code();
   return true;
 }
 
 bool URLRequestHttpJob::IsSafeRedirect(const GURL& location) {
   // We only allow redirects to certain "safe" protocols.  This does not
   // restrict redirects to externally handled protocols.  Our consumer would
   // need to take care of those.
 
@@ skipping 330 matching lines @@
   DCHECK(response_cookies_.empty());
 
   std::string name = "Set-Cookie";
   std::string value;
 
   void* iter = NULL;
   while (response_info_->headers->EnumerateHeader(&iter, name, &value))
     response_cookies_.push_back(value);
 }