Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(617)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/socket/ssl_client_socket_pool.cc

Issue 9618002: SPDY - integration of spdy/3 code. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« net/http/http_network_layer.cc ('K') | « net/socket/ssl_client_socket.cc ('k') | net/spdy/buffered_spdy_framer.h » ('j') | net/spdy/buffered_spdy_framer.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/ssl_client_socket_pool.cc
===================================================================
--- net/socket/ssl_client_socket_pool.cc (revision 125802)
+++ net/socket/ssl_client_socket_pool.cc (working copy)
@@ -303,7 +303,8 @@
// TODO(mbelshe): verify it was a protocol we advertised?
if (protocol_negotiated == SSLClientSocket::kProtoSPDY1 ||
protocol_negotiated == SSLClientSocket::kProtoSPDY2 ||
- protocol_negotiated == SSLClientSocket::kProtoSPDY21) {
+ protocol_negotiated == SSLClientSocket::kProtoSPDY21 ||
+ protocol_negotiated == SSLClientSocket::kProtoSPDY3) {
ssl_socket_->set_was_spdy_negotiated(true);
}
}
« net/http/http_network_layer.cc ('K') | « net/socket/ssl_client_socket.cc ('k') | net/spdy/buffered_spdy_framer.h » ('j') | net/spdy/buffered_spdy_framer.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698