net/http/http_stream_factory_impl_job.cc - Issue 1387363004: Disable HTTP/2 over NPN (with OpenSSL).

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 1387363004: Disable HTTP/2 over NPN (with OpenSSL). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Disable NPN in NSS if npn_protos.empty(). Created 5 years, 2 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_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 3625e4a4ef9ec69d6ef2fa518835fc3d91c1b243..174ac113642b6dd6eaed8e74bf3446d2f399d1d2 100644

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

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

@@ -949,7 +949,8 @@ int HttpStreamFactoryImpl::Job::DoInitConnection() {

if (stream_factory_->for_websockets_) {

// TODO(ricea): Re-enable NPN when WebSockets over SPDY is supported.

SSLConfig websocket_server_ssl_config = server_ssl_config_;

- websocket_server_ssl_config.next_protos.clear();

+ websocket_server_ssl_config.alpn_protos.clear();

+ websocket_server_ssl_config.npn_protos.clear();

return InitSocketHandleForWebSocketRequest(

GetSocketGroup(), server_, request_info_.extra_headers,

request_info_.load_flags, priority_, session_, proxy_info_, expect_spdy,