net/http/http_network_transaction.cc - Issue 1575048: SPDY: Change Chrome code to support new NPN protocols.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: net/http/http_network_transaction.cc

Issue 1575048: SPDY: Change Chrome code to support new NPN protocols. (Closed)

Patch Set: oops Created 10 years, 8 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:

Index: net/http/http_network_transaction.cc

diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc

index ef111ea8d27a4eaed1572717c4c627ab8d6d1a07..1c11e382de9d962f77a50f475d834fc179837cd6 100644

--- a/net/http/http_network_transaction.cc

+++ b/net/http/http_network_transaction.cc

@@ -866,9 +866,9 @@ int HttpNetworkTransaction::DoSSLConnectComplete(int result) {

// here, then we know that we called SSL_ImportFD.

if (result == OK || IsCertificateError(result))

status = ssl_socket->GetNextProto(&proto);

- static const char kSpdyProto[] = "spdy";

using_spdy_ = (status == SSLClientSocket::kNextProtoNegotiated &&

- proto == kSpdyProto);

+ SSLClientSocket::NextProtoFromString(proto) ==

+ SSLClientSocket::kProtoSPDY1);

if (alternate_protocol_mode_ == kUsingAlternateProtocol &&

alternate_protocol_ == HttpAlternateProtocols::NPN_SPDY_1 &&

« no previous file with comments | « net/http/http_network_layer.cc ('k') | net/socket/ssl_client_socket.h » ('j') | no next file with comments »