Allow a non-200 (or non-407) response for a CONNECT request from an HTTPS pro...

net/http/http_proxy_client_socket.h

 // Copyright (c) 2010 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.
 
 #ifndef NET_HTTP_HTTP_PROXY_CLIENT_SOCKET_H_
 #define NET_HTTP_HTTP_PROXY_CLIENT_SOCKET_H_
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/ref_counted.h"
 #include "net/base/completion_callback.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/net_log.h"
+#include "net/http/http_proxy_tunnel_client_socket.h"

[willchan no longer on Chromium, 2010/12/14 00:34:42]

Sort alphabetically?

[Ryan Hamilton, 2010/12/15 20:14:17]

Done.

 #include "net/http/http_auth_controller.h"
 #include "net/http/http_request_headers.h"
 #include "net/http/http_request_info.h"
 #include "net/http/http_response_info.h"
-#include "net/socket/client_socket.h"
 
 class GURL;
 
 namespace net {
 
 class AddressList;
 class ClientSocketHandle;
 class GrowableIOBuffer;
 class HttpAuthCache;
 class HttpAuthHandleFactory;
 class HttpStream;
 class HttpStreamParser;
 class IOBuffer;
 
-class HttpProxyClientSocket : public ClientSocket {
+class HttpProxyClientSocket : public HttpProxyTunnelClientSocket {

[willchan no longer on Chromium, 2010/12/14 00:34:42]

This naming looks weird.  I didn't read through all the comments between you and
vandebo, but I think I remember some discussion on fixing naming in the future. 
Please do so :)

[Ryan Hamilton, 2010/12/15 20:14:17]

You're right, I missed one.  Thanks!

  public:
   // Takes ownership of |transport_socket|, which should already be connected
   // by the time Connect() is called.  If tunnel is true then on Connect()
   // this socket will establish an Http tunnel.
   HttpProxyClientSocket(ClientSocketHandle* transport_socket,
                         const GURL& request_url,
                         const std::string& user_agent,
                         const HostPortPair& endpoint,
                         const HostPortPair& proxy_server,
                         HttpAuthCache* http_auth_cache,
                         HttpAuthHandlerFactory* http_auth_handler_factory,
                         bool tunnel,
-                        bool using_spdy);
+                        bool using_spdy,
+                        bool is_https_proxy);
 
   // On destruction Disconnect() is called.
   virtual ~HttpProxyClientSocket();
 
   // If Connect (or its callback) returns PROXY_AUTH_REQUESTED, then
   // credentials should be added to the HttpAuthController before calling
   // RestartWithAuth.
   int RestartWithAuth(CompletionCallback* callback);
 
-  const HttpResponseInfo* GetResponseInfo() const {
+  const HttpResponseInfo* GetConnectResponseInfo() const {
     return response_.headers ? &response_ : NULL;
   }
 
+  virtual HttpStream* GetConnectResponseStream();
+
   const scoped_refptr<HttpAuthController>& auth_controller() {
     return auth_;
   }
 
   bool using_spdy() {
     return using_spdy_;
   }
 
   // ClientSocket methods:
 
@@ skipping 67 matching lines @@
   CompletionCallback* user_callback_;
 
   HttpRequestInfo request_;
   HttpResponseInfo response_;
 
   scoped_refptr<GrowableIOBuffer> parser_buf_;
   scoped_ptr<HttpStreamParser> http_stream_parser_;
   scoped_refptr<IOBuffer> drain_buf_;
 
   // Stores the underlying socket.
-  const scoped_ptr<ClientSocketHandle> transport_;
+  scoped_ptr<ClientSocketHandle> transport_;
 
   // The hostname and port of the endpoint.  This is not necessarily the one
   // specified by the URL, due to Alternate-Protocol or fixed testing ports.
   const HostPortPair endpoint_;
   scoped_refptr<HttpAuthController> auth_;
   const bool tunnel_;
   // If true, then the connection to the proxy is a SPDY connection.
   const bool using_spdy_;
+  // If true, then SSL is used to communicate with this proxy
+  const bool is_https_proxy_;
 
   std::string request_line_;
   HttpRequestHeaders request_headers_;
 
   const BoundNetLog net_log_;
 
   DISALLOW_COPY_AND_ASSIGN(HttpProxyClientSocket);
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_PROXY_CLIENT_SOCKET_H_