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

net/spdy/spdy_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_SPDY_SPDY_PROXY_CLIENT_SOCKET_H_
 #define NET_SPDY_SPDY_PROXY_CLIENT_SOCKET_H_
 #pragma once
 
 #include <string>
 #include <list>
 
 #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_auth_controller.h"
+#include "net/http/http_proxy_tunnel_client_socket.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"
+#include "net/spdy/spdy_http_stream.h"
 #include "net/spdy/spdy_protocol.h"
 #include "net/spdy/spdy_session.h"
 #include "net/spdy/spdy_stream.h"
 
 
 class GURL;
 
 namespace net {
 
 class AddressList;
 class ClientSocketHandle;
 class HttpStream;
 class IOBuffer;
 class SpdySession;
 class SpdyStream;
 
-class SpdyProxyClientSocket : public ClientSocket, public SpdyStream::Delegate {
+class SpdyProxyClientSocket : public HttpProxyTunnelClientSocket,
+                              public SpdyStream::Delegate {
  public:
   // Create a socket on top of the |spdy_stream| by sending a SYN_STREAM
   // CONNECT frame for |endpoint|.  After the SYN_REPLY is received,
   // any data read/written to the socket will be transferred in data
   // frames.
   SpdyProxyClientSocket(SpdyStream* spdy_stream,
                         const std::string& user_agent,
                         const HostPortPair& endpoint,
                         const GURL& url,
                         const HostPortPair& proxy_server,
                         HttpAuthCache* auth_cache,
                         HttpAuthHandlerFactory* auth_handler_factory);
 
 
   // On destruction Disconnect() is called.
   virtual ~SpdyProxyClientSocket();
 
   const scoped_refptr<HttpAuthController>& auth_controller() {
     return auth_;
   }
 
-  const HttpResponseInfo* GetConnectResponseInfo() const {
+  // HttpProxyTunnelClientSocket methods:
+
+  virtual const HttpResponseInfo* GetConnectResponseInfo() const {
     return response_.headers ? &response_ : NULL;
   }
 
+  // In the event of a non-200 response to the CONNECT request, this
+  // method may be called to return an HttpStream in order to read
+  // the response body.
+  virtual HttpStream* GetConnectResponseStream() {
+    SpdyStream* stream = spdy_stream_;

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

Should this implementation go in the .cpp ?

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

Done.

+    spdy_stream_ = NULL;
+    return new SpdyHttpStream(stream);
+  }
+
   // ClientSocket methods:
 
   virtual int Connect(CompletionCallback* callback);
   virtual void Disconnect();
   virtual bool IsConnected() const;
   virtual bool IsConnectedAndIdle() const;
   virtual const BoundNetLog& NetLog() const { return net_log_; }
   virtual void SetSubresourceSpeculation();
   virtual void SetOmniboxSpeculation();
   virtual bool WasEverUsed() const;
@@ skipping 102 matching lines @@
   bool was_ever_used_;
 
   const BoundNetLog net_log_;
 
   DISALLOW_COPY_AND_ASSIGN(SpdyProxyClientSocket);
 };
 
 }  // namespace net
 
 #endif  // NET_SPDY_SPDY_PROXY_CLIENT_SOCKET_H_