net/http/http_proxy_client_socket_pool.cc - Issue 1097773003: Clean up NPN/ALPN-related SSLClientSocket bits.

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_proxy_client_socket_pool.cc

Issue 1097773003: Clean up NPN/ALPN-related SSLClientSocket bits. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rsleevi comment Created 5 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_proxy_client_socket_pool.cc

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

index ff5fdf9f843f9611ed29807837c9a720543a5394..9b9c382a9c007fc57a05e01819bfb8d7c5da40b8 100644

--- a/net/http/http_proxy_client_socket_pool.cc

+++ b/net/http/http_proxy_client_socket_pool.cc

@@ -259,8 +259,8 @@ int HttpProxyConnectJob::DoSSLConnectComplete(int result) {

SSLClientSocket* ssl =

static_cast<SSLClientSocket*>(transport_socket_handle_->socket());

- using_spdy_ = ssl->was_spdy_negotiated();

protocol_negotiated_ = ssl->GetNegotiatedProtocol();

+ using_spdy_ = NextProtoIsSPDY(protocol_negotiated_);

// Reset the timer to just the length of time allowed for HttpProxy handshake

// so that a fast SSL connection plus a slow HttpProxy failure doesn't take