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

Side by Side 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: Re: #7. 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:
View unified diff | Download patch
« no previous file with comments | « net/http/http_server_properties.cc ('k') | net/log/net_log_util.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/http/http_stream_factory_impl_job.h" 5 #include "net/http/http_stream_factory_impl_job.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 931 matching lines...) Expand 10 before | Expand all | Expand 10 after
942 // If we can't use a SPDY session, don't bother checking for one after 942 // If we can't use a SPDY session, don't bother checking for one after
943 // the hostname is resolved. 943 // the hostname is resolved.
944 OnHostResolutionCallback resolution_callback = 944 OnHostResolutionCallback resolution_callback =
945 CanUseExistingSpdySession() 945 CanUseExistingSpdySession()
946 ? base::Bind(&Job::OnHostResolution, session_->spdy_session_pool(), 946 ? base::Bind(&Job::OnHostResolution, session_->spdy_session_pool(),
947 spdy_session_key) 947 spdy_session_key)
948 : OnHostResolutionCallback(); 948 : OnHostResolutionCallback();
949 if (stream_factory_->for_websockets_) { 949 if (stream_factory_->for_websockets_) {
950 // TODO(ricea): Re-enable NPN when WebSockets over SPDY is supported. 950 // TODO(ricea): Re-enable NPN when WebSockets over SPDY is supported.
951 SSLConfig websocket_server_ssl_config = server_ssl_config_; 951 SSLConfig websocket_server_ssl_config = server_ssl_config_;
952 websocket_server_ssl_config.next_protos.clear(); 952 websocket_server_ssl_config.alpn_protos.clear();
953 websocket_server_ssl_config.npn_protos.clear();
953 return InitSocketHandleForWebSocketRequest( 954 return InitSocketHandleForWebSocketRequest(
954 GetSocketGroup(), server_, request_info_.extra_headers, 955 GetSocketGroup(), server_, request_info_.extra_headers,
955 request_info_.load_flags, priority_, session_, proxy_info_, expect_spdy, 956 request_info_.load_flags, priority_, session_, proxy_info_, expect_spdy,
956 websocket_server_ssl_config, proxy_ssl_config_, 957 websocket_server_ssl_config, proxy_ssl_config_,
957 request_info_.privacy_mode, net_log_, connection_.get(), 958 request_info_.privacy_mode, net_log_, connection_.get(),
958 resolution_callback, io_callback_); 959 resolution_callback, io_callback_);
959 } 960 }
960 961
961 return InitSocketHandleForHttpRequest( 962 return InitSocketHandleForHttpRequest(
962 GetSocketGroup(), server_, request_info_.extra_headers, 963 GetSocketGroup(), server_, request_info_.extra_headers,
(...skipping 653 matching lines...) Expand 10 before | Expand all | Expand 10 after
1616 if (connection_->socket()) { 1617 if (connection_->socket()) {
1617 ConnectionAttempts socket_attempts; 1618 ConnectionAttempts socket_attempts;
1618 connection_->socket()->GetConnectionAttempts(&socket_attempts); 1619 connection_->socket()->GetConnectionAttempts(&socket_attempts);
1619 request_->AddConnectionAttempts(socket_attempts); 1620 request_->AddConnectionAttempts(socket_attempts);
1620 } else { 1621 } else {
1621 request_->AddConnectionAttempts(connection_->connection_attempts()); 1622 request_->AddConnectionAttempts(connection_->connection_attempts());
1622 } 1623 }
1623 } 1624 }
1624 1625
1625 } // namespace net 1626 } // namespace net
OLDNEW
« no previous file with comments | « net/http/http_server_properties.cc ('k') | net/log/net_log_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698