net/http/http_proxy_client_socket_pool.cc - Issue 9958028: Add a new GetNegotiatedProtocol method to StreamSocket and implement in all subclasses.

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 9958028: Add a new GetNegotiatedProtocol method to StreamSocket and implement in all subclasses. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase 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

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 e6adfacd628be5c9a200bd94546f042637e6127c..67018779f3405c5c9b61109b6a21776a8f712fa7 100644

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

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

@@ -238,7 +238,7 @@ int HttpProxyConnectJob::DoSSLConnectComplete(int result) {

SSLClientSocket* ssl =

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

using_spdy_ = ssl->was_spdy_negotiated();

- protocol_negotiated_ = ssl->protocol_negotiated();

+ protocol_negotiated_ = ssl->GetNegotiatedProtocol();

// 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

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