Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(765)

Unified Diff: net/http/http_stream_factory_impl_job.cc

Issue 851503003: Update from https://crrev.com/311076 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 11 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
« no previous file with comments | « net/http/http_server_properties_manager.cc ('k') | net/http/http_stream_factory_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 83694437450b028590ae8617ad8ce1ec05071154..d531476c81b8964868133fb85672f2f860feb357 100644
--- a/net/http/http_stream_factory_impl_job.cc
+++ b/net/http/http_stream_factory_impl_job.cc
@@ -817,6 +817,16 @@ int HttpStreamFactoryImpl::Job::DoInitConnection() {
false /* not a proxy server */);
}
+ base::WeakPtr<HttpServerProperties> http_server_properties =
+ session_->http_server_properties();
+ if (http_server_properties) {
+ http_server_properties->MaybeForceHTTP11(origin_, &server_ssl_config_);
+ if (proxy_info_.is_http() || proxy_info_.is_https()) {
+ http_server_properties->MaybeForceHTTP11(
+ proxy_info_.proxy_server().host_port_pair(), &proxy_ssl_config_);
+ }
+ }
+
if (IsPreconnecting()) {
DCHECK(!stream_factory_->for_websockets_);
return PreconnectSocketsForHttpRequest(
« no previous file with comments | « net/http/http_server_properties_manager.cc ('k') | net/http/http_stream_factory_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698