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

net/spdy/spdy_http_stream.cc

 // 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.
 
 #include "net/spdy/spdy_http_stream.h"
 
 #include <algorithm>
 #include <list>
 #include <string>
 
@@ skipping 15 matching lines @@
       stream_(NULL),
       spdy_session_(spdy_session),
       response_info_(NULL),
       download_finished_(false),
       user_callback_(NULL),
       user_buffer_len_(0),
       buffered_read_callback_pending_(false),
       more_read_data_pending_(false),
       direct_(direct) { }
 
+SpdyHttpStream::SpdyHttpStream(SpdyStream* spdy_stream)
+    : ALLOW_THIS_IN_INITIALIZER_LIST(read_callback_factory_(this)),
+      stream_(spdy_stream),
+      spdy_session_(NULL),
+      response_info_(NULL),
+      download_finished_(false),
+      user_callback_(NULL),
+      user_buffer_len_(0),
+      buffered_read_callback_pending_(false),

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

Should some of these settings come from the passed spdy_stream?

i.e. looks like SpdyHttpStream::ReadResponseBody might use spdy_session_

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

I don't *think* any of the fields need to come from the spdy_stream.  In
ReadResponseBody, there was a call to spdy_session_->flow_control(), but
flow_control() is a static method so I changed it (in an earlier CL) to call
SpdySession::flow_control(). As far as I was able to tell (and test)
SpdyHttpStream works find (in this mode) when spdy_session_ is null.

None of the other fields look to me like they could be initialized from the
spdy_stream.

+      more_read_data_pending_(false),
+      direct_(false) {
+  stream_->SetDelegate(this);
+}
+
 SpdyHttpStream::~SpdyHttpStream() {
   if (stream_)
     stream_->DetachDelegate();
 }
 
 int SpdyHttpStream::InitializeStream(const HttpRequestInfo* request_info,
                                      const BoundNetLog& stream_net_log,
                                      CompletionCallback* callback) {
+  DCHECK(!stream_.get());
   if (spdy_session_->IsClosed())
    return ERR_CONNECTION_CLOSED;
 
   request_info_ = request_info;
   if (request_info_->method == "GET") {
     int error = spdy_session_->GetPushStream(request_info_->url, &stream_,
                                              stream_net_log);
     if (error != OK)
       return error;
   }
@@ skipping 323 matching lines @@
   stream_->GetSSLInfo(ssl_info, &using_npn);
 }
 
 void SpdyHttpStream::GetSSLCertRequestInfo(
     SSLCertRequestInfo* cert_request_info) {
   DCHECK(stream_);
   stream_->GetSSLCertRequestInfo(cert_request_info);
 }
 
 }  // namespace net