OLD | NEW |
---|---|
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 "jingle/glue/proxy_resolving_client_socket.h" | 5 #include "jingle/glue/proxy_resolving_client_socket.h" |
6 | 6 |
7 #include <stdint.h> | 7 #include <stdint.h> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
77 // TODO(mmenke): Just copying specific parameters seems highly regression | 77 // TODO(mmenke): Just copying specific parameters seems highly regression |
78 // prone. Should have a better way to do this. | 78 // prone. Should have a better way to do this. |
79 session_params.host_mapping_rules = reference_params->host_mapping_rules; | 79 session_params.host_mapping_rules = reference_params->host_mapping_rules; |
80 session_params.ignore_certificate_errors = | 80 session_params.ignore_certificate_errors = |
81 reference_params->ignore_certificate_errors; | 81 reference_params->ignore_certificate_errors; |
82 session_params.testing_fixed_http_port = | 82 session_params.testing_fixed_http_port = |
83 reference_params->testing_fixed_http_port; | 83 reference_params->testing_fixed_http_port; |
84 session_params.testing_fixed_https_port = | 84 session_params.testing_fixed_https_port = |
85 reference_params->testing_fixed_https_port; | 85 reference_params->testing_fixed_https_port; |
86 session_params.next_protos = reference_params->next_protos; | 86 session_params.next_protos = reference_params->next_protos; |
87 session_params.trusted_spdy_proxy = reference_params->trusted_spdy_proxy; | |
88 session_params.forced_spdy_exclusions = | 87 session_params.forced_spdy_exclusions = |
mmenke
2016/02/02 16:51:26
You should talk to the owners of this file about t
tbansal1
2016/02/02 18:18:44
I do not understand this comment. Currently, Proxy
mmenke
2016/02/02 18:45:02
Right, but trusted_spdy_proxy was being copied, as
tbansal1
2016/02/02 19:34:32
Acked, the concept of trusted SPDY proxy is gettin
| |
89 reference_params->forced_spdy_exclusions; | 88 reference_params->forced_spdy_exclusions; |
90 session_params.parse_alternative_services = | 89 session_params.parse_alternative_services = |
91 reference_params->parse_alternative_services; | 90 reference_params->parse_alternative_services; |
92 session_params.enable_alternative_service_with_different_host = | 91 session_params.enable_alternative_service_with_different_host = |
93 reference_params->enable_alternative_service_with_different_host; | 92 reference_params->enable_alternative_service_with_different_host; |
94 } | 93 } |
95 | 94 |
96 network_session_.reset(new net::HttpNetworkSession(session_params)); | 95 network_session_.reset(new net::HttpNetworkSession(session_params)); |
97 } | 96 } |
98 | 97 |
(...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
433 return 0; | 432 return 0; |
434 } | 433 } |
435 | 434 |
436 void ProxyResolvingClientSocket::CloseTransportSocket() { | 435 void ProxyResolvingClientSocket::CloseTransportSocket() { |
437 if (transport_.get() && transport_->socket()) | 436 if (transport_.get() && transport_->socket()) |
438 transport_->socket()->Disconnect(); | 437 transport_->socket()->Disconnect(); |
439 transport_.reset(); | 438 transport_.reset(); |
440 } | 439 } |
441 | 440 |
442 } // namespace jingle_glue | 441 } // namespace jingle_glue |
OLD | NEW |