net/socket_stream/socket_stream.cc - Issue 16501002: Give more request types a TransportSecurityState.

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/socket_stream/socket_stream.cc

Issue 16501002: Give more request types a TransportSecurityState. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Resolve merge conflict after rebase. Created 7 years, 6 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/socket_stream/socket_stream.cc

diff --git a/net/socket_stream/socket_stream.cc b/net/socket_stream/socket_stream.cc

index 6c8cbd373502468a9f14050c2ee6e88c9ad8d1a4..5ff4fb05c624a174957ec2e71fd6aaf1de53323d 100644

--- a/net/socket_stream/socket_stream.cc

+++ b/net/socket_stream/socket_stream.cc

@@ -983,6 +983,7 @@ int SocketStream::DoSecureProxyConnect() {

DCHECK(factory_);

SSLClientSocketContext ssl_context;

ssl_context.cert_verifier = context_->cert_verifier();

+ ssl_context.transport_security_state = context_->transport_security_state();

ssl_context.server_bound_cert_service = context_->server_bound_cert_service();

socket_.reset(factory_->CreateSSLClientSocket(

socket_.release(),

@@ -1036,6 +1037,7 @@ int SocketStream::DoSSLConnect() {

DCHECK(factory_);

SSLClientSocketContext ssl_context;

ssl_context.cert_verifier = context_->cert_verifier();

+ ssl_context.transport_security_state = context_->transport_security_state();

ssl_context.server_bound_cert_service = context_->server_bound_cert_service();

socket_.reset(factory_->CreateSSLClientSocket(socket_.release(),

HostPortPair::FromURL(url_),