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

net/spdy/spdy_proxy_client_socket.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_proxy_client_socket.h"
 
 #include <algorithm>  // min
 
 #include "base/logging.h"
 #include "base/string_util.h"
@@ skipping 87 matching lines @@
     // This will cause OnClose to be invoked, which takes care of
     // cleaning up all the internal state.
     spdy_stream_->Cancel();
 }
 
 bool SpdyProxyClientSocket::IsConnected() const {
   return next_state_ == STATE_OPEN || next_state_ == STATE_CLOSED;
 }
 
 bool SpdyProxyClientSocket::IsConnectedAndIdle() const {
-  return IsConnected() && !spdy_stream_->is_idle();
+  return IsConnected() && spdy_stream_.get() && !spdy_stream_->is_idle();

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

Why did this change?

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

Bug, actually.  Removed.

 }
 
 void SpdyProxyClientSocket::SetSubresourceSpeculation() {
   // TODO(rch): what should this implementation be?
 }
 
 void SpdyProxyClientSocket::SetOmniboxSpeculation() {
   // TODO(rch): what should this implementation be?
 }
 
@@ skipping 229 matching lines @@
 
   next_state_ = STATE_OPEN;
   if (net_log_.IsLoggingAllEvents()) {
     net_log_.AddEvent(
         NetLog::TYPE_HTTP_TRANSACTION_READ_TUNNEL_RESPONSE_HEADERS,
         make_scoped_refptr(new NetLogHttpResponseParameter(response_.headers)));
   }
 
   if (response_.headers->response_code() == 200)
     return OK;
+  else if (response_.headers->response_code() == 407)
+    return ERR_TUNNEL_CONNECTION_FAILED;
   else
-    return ERR_TUNNEL_CONNECTION_FAILED;
+    return ERR_HTTPS_PROXY_TUNNEL_CONNECTION_RESPONSE;
 }
 
 // SpdyStream::Delegate methods:
 // Called when SYN frame has been sent.
 // Returns true if no more data to be sent after SYN frame.
 bool SpdyProxyClientSocket::OnSendHeadersComplete(int status) {
   DCHECK_EQ(next_state_, STATE_SEND_REQUEST_COMPLETE);
 
   OnIOComplete(status);
 
@@ skipping 92 matching lines @@
     read_callback->Run(status);
   } else if (read_callback_) {
     // If we have a read_callback, the we need to make sure we call it back
     OnDataReceived(NULL, 0);
   }
   if (write_callback)
     write_callback->Run(ERR_CONNECTION_CLOSED);
 }
 
 }  // namespace net