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

Side by Side Diff: jingle/glue/proxy_resolving_client_socket.cc

Issue 275953002: Remove HTTP pipelining support. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge Created 6 years, 7 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 | Annotate | Revision Log
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 "jingle/glue/proxy_resolving_client_socket.h" 5 #include "jingle/glue/proxy_resolving_client_socket.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/bind_helpers.h" 9 #include "base/bind_helpers.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 session_params.http_server_properties = 66 session_params.http_server_properties =
67 request_context->http_server_properties(); 67 request_context->http_server_properties();
68 session_params.net_log = request_context->net_log(); 68 session_params.net_log = request_context->net_log();
69 69
70 const net::HttpNetworkSession::Params* reference_params = 70 const net::HttpNetworkSession::Params* reference_params =
71 request_context->GetNetworkSessionParams(); 71 request_context->GetNetworkSessionParams();
72 if (reference_params) { 72 if (reference_params) {
73 session_params.host_mapping_rules = reference_params->host_mapping_rules; 73 session_params.host_mapping_rules = reference_params->host_mapping_rules;
74 session_params.ignore_certificate_errors = 74 session_params.ignore_certificate_errors =
75 reference_params->ignore_certificate_errors; 75 reference_params->ignore_certificate_errors;
76 session_params.http_pipelining_enabled =
77 reference_params->http_pipelining_enabled;
78 session_params.testing_fixed_http_port = 76 session_params.testing_fixed_http_port =
79 reference_params->testing_fixed_http_port; 77 reference_params->testing_fixed_http_port;
80 session_params.testing_fixed_https_port = 78 session_params.testing_fixed_https_port =
81 reference_params->testing_fixed_https_port; 79 reference_params->testing_fixed_https_port;
82 session_params.trusted_spdy_proxy = reference_params->trusted_spdy_proxy; 80 session_params.trusted_spdy_proxy = reference_params->trusted_spdy_proxy;
83 } 81 }
84 82
85 network_session_ = new net::HttpNetworkSession(session_params); 83 network_session_ = new net::HttpNetworkSession(session_params);
86 } 84 }
87 85
(...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after
389 return false; 387 return false;
390 } 388 }
391 389
392 void ProxyResolvingClientSocket::CloseTransportSocket() { 390 void ProxyResolvingClientSocket::CloseTransportSocket() {
393 if (transport_.get() && transport_->socket()) 391 if (transport_.get() && transport_->socket())
394 transport_->socket()->Disconnect(); 392 transport_->socket()->Disconnect();
395 transport_.reset(); 393 transport_.reset();
396 } 394 }
397 395
398 } // namespace jingle_glue 396 } // namespace jingle_glue
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698