Chromium Code Reviews| Index: net/http/http_network_transaction.cc |
| diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc |
| index b90930afb5cc6ee6c7cec17390aa9c1423079f0a..fbb65c9ed663305279bfd862a6d3e745edc3ae0e 100644 |
| --- a/net/http/http_network_transaction.cc |
| +++ b/net/http/http_network_transaction.cc |
| @@ -53,6 +53,7 @@ |
| #include "net/http/transport_security_state.h" |
| #include "net/http/url_security_manager.h" |
| #include "net/log/net_log_event_type.h" |
| +#include "net/proxy/proxy_server.h" |
| #include "net/socket/client_socket_factory.h" |
| #include "net/socket/socks_client_socket_pool.h" |
| #include "net/socket/ssl_client_socket.h" |
| @@ -456,7 +457,9 @@ void HttpNetworkTransaction::OnStreamReady(const SSLConfig& used_ssl_config, |
| response_.was_fetched_via_spdy = stream_request_->using_spdy(); |
| response_.was_fetched_via_proxy = !proxy_info_.is_direct(); |
| if (response_.was_fetched_via_proxy && !proxy_info_.is_empty()) |
| - response_.proxy_server = proxy_info_.proxy_server().host_port_pair(); |
| + response_.proxy_server = proxy_info_.proxy_server(); |
| + else if (!response_.was_fetched_via_proxy && proxy_info_.is_direct()) |
| + response_.proxy_server = ProxyServer::Direct(); |
|
eroman
2016/10/05 01:45:12
Do we need an else that sets an invalid ProxyServe
tbansal1
2016/10/06 14:35:09
Done.
|
| OnIOComplete(OK); |
| } |