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

net/http/http_proxy_client_socket.h

Index: net/http/http_proxy_client_socket.h
===================================================================
--- net/http/http_proxy_client_socket.h	(revision 68026)
+++ net/http/http_proxy_client_socket.h	(working copy)
@@ -13,11 +13,12 @@
 #include "net/base/completion_callback.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/net_log.h"
+#include "net/http/connect_response_http_stream.h"
+#include "net/http/http_proxy_tunnel_client_socket.h"
 #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;
 
@@ -32,7 +33,7 @@
 class HttpStreamParser;
 class IOBuffer;
 
-class HttpProxyClientSocket : public ClientSocket {
+class HttpProxyClientSocket : public HttpProxyTunnelClientSocket {
  public:
   // Takes ownership of |transport_socket|, which should already be connected
   // by the time Connect() is called.  If tunnel is true then on Connect()
@@ -45,7 +46,8 @@
                         HttpAuthCache* http_auth_cache,
                         HttpAuthHandlerFactory* http_auth_handler_factory,
                         bool tunnel,
-                        bool using_spdy);
+                        bool using_spdy,
+                        bool is_https_proxy);

[vandebo (ex-Chrome), 2010/12/04 00:30:37]

Can you look at proxy_server instead of passing is_https_proxy?

[Ryan Hamilton, 2010/12/09 21:19:35]

Alas not.  proxy_server is merely a HostPortPair, but it does not tell us if we
are talking SSL to it.

 
   // On destruction Disconnect() is called.
   virtual ~HttpProxyClientSocket();
@@ -55,10 +57,14 @@
   // RestartWithAuth.
   int RestartWithAuth(CompletionCallback* callback);
 
-  const HttpResponseInfo* GetResponseInfo() const {
+  const HttpResponseInfo* GetConnectResponseInfo() const {
     return response_.headers ? &response_ : NULL;
   }
 
+  virtual HttpStream* GetConnectResponseStream() {

[vandebo (ex-Chrome), 2010/12/04 00:30:37]

This should probably go in the .cpp file (and take the header it needs with it).

[Ryan Hamilton, 2010/12/09 21:19:35]

Done.

+    return new ConnectResponseHttpStream(http_stream_parser_.release());
+  }
+
   const scoped_refptr<HttpAuthController>& auth_controller() {
     return auth_;
   }
@@ -155,6 +161,8 @@
   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_;