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

net/http/connect_response_http_stream.h

Index: net/http/connect_response_http_stream.h
===================================================================
--- net/http/connect_response_http_stream.h	(revision 0)
+++ net/http/connect_response_http_stream.h	(revision 0)
@@ -0,0 +1,84 @@
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.

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

Why do you need a ConnectResponseHttpStream?  Why not just use an HttpStream?

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

2010

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

Well HttpStream is abstract/virtual, right?  Did you mean HttpBasicStream?

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

Done.

+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+//
+// ConnectResponseHttpStream is a simple implementation of HttpStream, for
+// Handling the processing of a non-200 response from a CONNECT request to an
+// HTTPS proxy.
+
+#ifndef NET_HTTP_CONNECT_RESPONSE_HTTP_STREAM_H_
+#define NET_HTTP_CONNECT_RESPONSE_HTTP_STREAM_H_
+#pragma once
+
+#include "base/basictypes.h"
+#include "base/scoped_ptr.h"
+#include "net/http/http_response_info.h"
+#include "net/http/http_stream.h"
+#include "net/http/http_stream_parser.h"
+
+namespace net {
+
+class BoundNetLog;
+class ClientSocketHandle;
+class GrowableIOBuffer;
+//class HttpResponseInfo;

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

remove

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

Done.

+struct HttpRequestInfo;
+class HttpRequestHeaders;
+class IOBuffer;
+class UploadDataStream;
+
+class ConnectResponseHttpStream : public HttpStream {

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

ResponseOnlyHttpStream ?

+ public:
+  ConnectResponseHttpStream(HttpStreamParser* parser);

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

explicit

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

Done.  (Then I changed the signature, and removed explicit :|)

+  virtual ~ConnectResponseHttpStream();
+
+  // HttpStream methods
+
+  virtual int InitializeStream(const HttpRequestInfo* request_info,
+                               const BoundNetLog& net_log,
+                               CompletionCallback* callback);
+
+  virtual int SendRequest(const HttpRequestHeaders& request_headers,
+                          UploadDataStream* request_body,
+                          HttpResponseInfo* response,
+                          CompletionCallback* callback);
+
+  virtual uint64 GetUploadProgress() const;
+
+  virtual int ReadResponseHeaders(CompletionCallback* callback);
+
+  virtual const HttpResponseInfo* GetResponseInfo() const;
+
+  virtual int ReadResponseBody(IOBuffer* buf, int buf_len,
+                               CompletionCallback* callback);
+
+  virtual void Close(bool not_reusable);
+
+  virtual HttpStream* RenewStreamForAuth();
+
+  virtual bool IsResponseBodyComplete() const;
+
+  virtual bool CanFindEndOfResponse() const;
+
+  virtual bool IsMoreDataBuffered() const;
+
+  virtual bool IsConnectionReused() const;
+  virtual void SetConnectionReused();
+
+  virtual void GetSSLInfo(SSLInfo* ssl_info);
+
+  virtual void GetSSLCertRequestInfo(SSLCertRequestInfo* cert_request_info);
+
+ private:
+  scoped_ptr<HttpStreamParser> parser_;
+
+  // |response_info_| is the HTTP response data object which is filled in
+  // when a SYN_REPLY comes in for the stream.
+  // It is not owned by this stream object, or point to |push_response_info_|.
+  HttpResponseInfo* response_info_;

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

This doesn't seem to be used.

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

Done.

+};
+
+}  // namespace net
+
+
+#endif // NET_HTTP_CONNECT_RESPONSE_HTTP_STREAM_H_
Property changes on: net/http/connect_response_http_stream.h
___________________________________________________________________
Added: svn:eol-style
   + LF