net/http/http_stream_factory_impl_job.cc - Issue 1121043002: Make alternate Jobs not use HTTP/1.1 sockets.

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 1121043002: Make alternate Jobs not use HTTP/1.1 sockets. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Another possible fix. 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_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 b07a461e9b0048a75a9d2c36958c99f6365997cf..fbf0b0d20cbff4928282484af31c89791d5ea5d4 100644

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

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

@@ -1111,6 +1111,9 @@ int HttpStreamFactoryImpl::Job::DoCreateStream() {

SetSocketMotivation();

if (!using_spdy_) {

+ if (IsAlternate()) {

+ return ERR_NPN_NEGOTIATION_FAILED;

+ }

davidben 2015/05/01 23:21:46 Nit: While I do like curly braces, Chromium style

Bence 2015/05/04 12:05:07 Done.

// We may get ftp scheme when fetching ftp resources through proxy.

bool using_proxy = (proxy_info_.is_http() || proxy_info_.is_https()) &&

(request_info_.url.SchemeIs("http") ||