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

net/http/connect_response_http_stream.cc

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

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

2010

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

Since this is so close to HttpBasicStream, would it be better to just add a
constructor to HttpBasicStream? I guess probably not, but I wonder if you
considered it.

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

Done.

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

You know, I initially considered this approach, and then decided that I didn't
like the idea of constructing an HttpBasicStream in a way that didn't permit
InitializeStream / SendRequest to be called.  However, I think you're right.  I
think it's cleaner to go the HttpBasicStream route.  Done.

+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "net/http/connect_response_http_stream.h"
+
+#include "base/logging.h"
+#include "net/base/net_errors.h"
+
+namespace net {
+
+ConnectResponseHttpStream::ConnectResponseHttpStream(HttpStreamParser* parser)
+    : parser_(parser) {
+}
+
+ConnectResponseHttpStream::~ConnectResponseHttpStream() {}
+
+int ConnectResponseHttpStream::InitializeStream(
+    const HttpRequestInfo* request_info,
+    const BoundNetLog& net_log,
+    CompletionCallback* callback) {
+  NOTREACHED();
+  return ERR_UNEXPECTED;
+}
+
+int ConnectResponseHttpStream::SendRequest(
+    const HttpRequestHeaders& request_headers,
+    UploadDataStream* request_body,
+    HttpResponseInfo* response,
+    CompletionCallback* callback) {
+  NOTREACHED();
+  return ERR_UNEXPECTED;
+}
+
+uint64 ConnectResponseHttpStream::GetUploadProgress() const {
+  return 0;
+}
+
+int ConnectResponseHttpStream::ReadResponseHeaders(
+    CompletionCallback* callback) {
+  NOTREACHED();
+  return ERR_UNEXPECTED;
+}
+
+const HttpResponseInfo* ConnectResponseHttpStream::GetResponseInfo() const {
+  NOTREACHED();
+  return NULL;
+}
+
+int ConnectResponseHttpStream::ReadResponseBody(IOBuffer* buf, int buf_len,
+                             CompletionCallback* callback) {
+  return parser_->ReadResponseBody(buf, buf_len, callback);
+}
+
+void ConnectResponseHttpStream::Close(bool not_reusable) {
+  return parser_->Close(not_reusable);

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

Should this be ->Close(true); ?  Or maybe a class bool to indicate if the stream
is definitely not reusable.

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

Done.

+}
+
+HttpStream* ConnectResponseHttpStream::RenewStreamForAuth() {
+  NOTREACHED();
+  return NULL;
+}
+
+bool ConnectResponseHttpStream::IsResponseBodyComplete() const {
+  return parser_->IsResponseBodyComplete();
+}
+
+bool ConnectResponseHttpStream::CanFindEndOfResponse() const {
+  return parser_->CanFindEndOfResponse();
+}
+
+bool ConnectResponseHttpStream::IsMoreDataBuffered() const {
+  return parser_->IsMoreDataBuffered();
+}
+
+bool ConnectResponseHttpStream::IsConnectionReused() const {
+  return parser_->IsConnectionReused();
+}
+
+void ConnectResponseHttpStream::SetConnectionReused() {
+  parser_->SetConnectionReused();
+}
+
+void ConnectResponseHttpStream::GetSSLInfo(SSLInfo* ssl_info) {
+  parser_->GetSSLInfo(ssl_info);
+}
+
+void ConnectResponseHttpStream::GetSSLCertRequestInfo(
+    SSLCertRequestInfo* cert_request_info) {
+  parser_->GetSSLCertRequestInfo(cert_request_info);
+}
+
+}  // namespace net
Property changes on: net/http/connect_response_http_stream.cc
___________________________________________________________________
Added: svn:eol-style
   + LF