Properly handle spdy3 responses.

net/spdy/spdy_session.cc

Index: net/spdy/spdy_session.cc
diff --git a/net/spdy/spdy_session.cc b/net/spdy/spdy_session.cc
index 0d6b352da8e85016d0ac95b89c2e42280255546e..f0c8f2e3438b067133c4b792a2c1ee562cff33f2 100644
--- a/net/spdy/spdy_session.cc
+++ b/net/spdy/spdy_session.cc
@@ -424,19 +424,18 @@ net::Error SpdySession::InitializeWithSocket(
   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);
@@ -813,7 +812,6 @@ void SpdySession::CloseStream(SpdyStreamId stream_id, int 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,
@@ -1407,20 +1405,13 @@ void SpdySession::OnSynStream(
   // 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()) {
-    ResetStream(stream_id, PROTOCOL_ERROR,
-                "Pushed stream did not contain a url.");
-    return;
-  }
-
-  GURL gurl(url);
+  GURL gurl = GetUrlFromHeaderBlock(*headers, GetProtocolVersion(), true);
   if (!gurl.is_valid()) {
     ResetStream(stream_id, PROTOCOL_ERROR,
-                "Pushed stream url was invalid: " + url);
+                "Pushed stream url was invalid: " + gurl.spec());
     return;
   }
+  const std::string& url = gurl.spec();
 
   // Verify we have a valid stream association.
   if (!IsStreamActive(associated_stream_id)) {