Properly handle spdy3 responses.

net/spdy/spdy_session.cc

 // Copyright (c) 2012 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_session.h"
 
 #include <map>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
@@ skipping 406 matching lines @@
     int certificate_error_code) {
   base::StatsCounter spdy_sessions("spdy.sessions");
   spdy_sessions.Increment();
 
   state_ = CONNECTED;
   connection_.reset(connection);
   is_secure_ = is_secure;
   certificate_error_code_ = certificate_error_code;
 
   NextProto protocol = g_default_protocol;
-  if (is_secure_) {
-    SSLClientSocket* ssl_socket = GetSSLClientSocket();
-    NextProto protocol_negotiated = ssl_socket->GetNegotiatedProtocol();
-    if (protocol_negotiated != kProtoUnknown) {
-      protocol = protocol_negotiated;
-    }
+  NextProto protocol_negotiated = connection->socket()->GetNegotiatedProtocol();
+  if (protocol_negotiated != kProtoUnknown) {
+    protocol = protocol_negotiated;
+  }
 
-    if (ssl_socket->WasDomainBoundCertSent()) {
-      // According to the SPDY spec, the credential associated with the TLS
-      // connection is stored in slot[1].
-      credential_state_.SetHasCredential(GURL("https://" +
-                                              host_port_pair().ToString()));
-    }
+

[ramant (doing other things), 2012/03/30 22:19:58]

nit: extra line.

[Ryan Hamilton, 2012/03/30 22:46:02]

Done.

+  SSLClientSocket* ssl_socket = GetSSLClientSocket();
+  if (ssl_socket && ssl_socket->WasDomainBoundCertSent()) {
+    // According to the SPDY spec, the credential associated with the TLS
+    // connection is stored in slot[1].
+    credential_state_.SetHasCredential(GURL("https://" +
+                                            host_port_pair().ToString()));
   }
 
   DCHECK(protocol >= kProtoSPDY2);
   DCHECK(protocol <= kProtoSPDY3);
   int version = (protocol == kProtoSPDY3) ? 3 : 2;
   flow_control_ = (protocol >= kProtoSPDY21);
 
   buffered_spdy_framer_.reset(new BufferedSpdyFramer(version));
   buffered_spdy_framer_->set_visitor(this);
   SendSettings();
@@ skipping 356 matching lines @@
 void SpdySession::CloseStream(SpdyStreamId stream_id, int status) {
   // TODO(mbelshe): We should send a RST_STREAM control frame here
   //                so that the server can cancel a large send.
 
   DeleteStream(stream_id, status);
 }
 
 void SpdySession::ResetStream(SpdyStreamId stream_id,
                               SpdyStatusCodes status,
                               const std::string& description) {
-
   net_log().AddEvent(
       NetLog::TYPE_SPDY_SESSION_SEND_RST_STREAM,
       make_scoped_refptr(new NetLogSpdyRstParameter(stream_id, status,
                                                     description)));
 
   DCHECK(buffered_spdy_framer_.get());
   scoped_ptr<SpdyRstStreamControlFrame> rst_frame(
       buffered_spdy_framer_->CreateRstStream(stream_id, status));
 
   // Default to lowest priority unless we know otherwise.
@@ skipping 573 matching lines @@
         associated_stream_id, stream_id);
     ResetStream(stream_id, INVALID_STREAM, description);
     return;
   }
 
   streams_pushed_count_++;
 
   // TODO(mbelshe): DCHECK that this is a GET method?
 
   // Verify that the response had a URL for us.
-  const std::string& url = ContainsKey(*headers, "url") ?
-      headers->find("url")->second : "";
-  if (url.empty()) {
+  GURL gurl = GetUrlFromHeaderBlock(*headers, GetProtocolVersion(), true);
+  if (!gurl.is_valid()) {
     ResetStream(stream_id, PROTOCOL_ERROR,
-                "Pushed stream did not contain a url.");
+                "Pushed stream url was invalid: " + gurl.spec());
     return;
   }
-
-  GURL gurl(url);
-  if (!gurl.is_valid()) {
-    ResetStream(stream_id, PROTOCOL_ERROR,
-                "Pushed stream url was invalid: " + url);
-    return;
-  }
+  const std::string& url = gurl.spec();
 
   // Verify we have a valid stream association.
   if (!IsStreamActive(associated_stream_id)) {
     ResetStream(stream_id, INVALID_ASSOCIATED_STREAM,
                 base::StringPrintf(
                     "Received OnSyn with inactive associated stream %d",
                     associated_stream_id));
     return;
   }
 
@@ skipping 512 matching lines @@
 SSLClientSocket* SpdySession::GetSSLClientSocket() const {
   if (!is_secure_)
     return NULL;
   SSLClientSocket* ssl_socket =
       reinterpret_cast<SSLClientSocket*>(connection_->socket());
   DCHECK(ssl_socket);
   return ssl_socket;
 }
 
 }  // namespace net