net/http/http_stream_factory_impl_job.cc - Issue 353713005: Implements new, more robust design for communicating between SSLConnectJobs.

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

Issue 353713005: Implements new, more robust design for communicating between SSLConnectJobs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Moved tests back to ssl_client_socket_unittest.cc, fixed various other issues. Created 6 years, 5 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/cert/multi_threaded_cert_verifier.cc ('K') | « net/http/http_proxy_client_socket_pool_unittest.cc ('k') | net/http/http_stream_factory_impl_unittest.cc » ('j') | net/socket/socket_test_util.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: net/http/http_stream_factory_impl_job.cc

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

index 82d7ed348ba08d7011bac70449d6f882859b9de2..d621d0b3251ca1f580cfea69a80ef4937d766d6e 100644

--- a/net/http/http_stream_factory_impl_job.cc

+++ b/net/http/http_stream_factory_impl_job.cc

@@ -920,8 +920,9 @@ int HttpStreamFactoryImpl::Job::DoInitConnectionComplete(int result) {

if (ssl_socket->WasNpnNegotiated()) {

was_npn_negotiated_ = true;

std::string proto;

+ std::string server_protos;

SSLClientSocket::NextProtoStatus status =

- ssl_socket->GetNextProto(&proto);

+ ssl_socket->GetNextProto(&proto, &server_protos);

wtc 2014/07/31 23:05:24 IMPORTANT: is this change part of the CL? It is un

mshelley 2014/08/02 23:59:14 Done.

NextProto protocol_negotiated =

SSLClientSocket::NextProtoFromString(proto);

protocol_negotiated_ = protocol_negotiated;