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