OLD | NEW |
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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/spdy/spdy_network_transaction.h" | 5 #include "net/spdy/spdy_network_transaction.h" |
6 | 6 |
7 #include "base/compiler_specific.h" | 7 #include "base/compiler_specific.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "base/scoped_ptr.h" | 9 #include "base/scoped_ptr.h" |
10 #include "base/stats_counters.h" | 10 #include "base/stats_counters.h" |
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
218 if (SpdySession::SSLMode()) { | 218 if (SpdySession::SSLMode()) { |
219 if (session_->fixed_https_port() != 0) | 219 if (session_->fixed_https_port() != 0) |
220 port = session_->fixed_https_port(); | 220 port = session_->fixed_https_port(); |
221 } else if (session_->fixed_http_port() != 0) { | 221 } else if (session_->fixed_http_port() != 0) { |
222 port = session_->fixed_http_port(); | 222 port = session_->fixed_http_port(); |
223 } | 223 } |
224 | 224 |
225 std::string connection_group = "spdy."; | 225 std::string connection_group = "spdy."; |
226 connection_group.append(host); | 226 connection_group.append(host); |
227 | 227 |
228 TCPSocketParams tcp_params(host, port, request_->priority, request_->referrer, | |
229 false); | |
230 HostPortPair host_port_pair(host, port); | 228 HostPortPair host_port_pair(host, port); |
| 229 TCPSocketParams tcp_params(host_port_pair, request_->priority, |
| 230 request_->referrer, false); |
231 | 231 |
232 spdy_ = session_->spdy_session_pool()->Get(host_port_pair, session_); | 232 spdy_ = session_->spdy_session_pool()->Get(host_port_pair, session_); |
233 DCHECK(spdy_); | 233 DCHECK(spdy_); |
234 | 234 |
235 return spdy_->Connect( | 235 return spdy_->Connect( |
236 connection_group, tcp_params, request_->priority, net_log_); | 236 connection_group, tcp_params, request_->priority, net_log_); |
237 } | 237 } |
238 | 238 |
239 int SpdyNetworkTransaction::DoInitConnectionComplete(int result) { | 239 int SpdyNetworkTransaction::DoInitConnectionComplete(int result) { |
240 if (result < 0) | 240 if (result < 0) |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
291 user_buffer_ = NULL; | 291 user_buffer_ = NULL; |
292 user_buffer_len_ = 0; | 292 user_buffer_len_ = 0; |
293 | 293 |
294 if (result <= 0) | 294 if (result <= 0) |
295 stream_ = NULL; | 295 stream_ = NULL; |
296 | 296 |
297 return result; | 297 return result; |
298 } | 298 } |
299 | 299 |
300 } // namespace net | 300 } // namespace net |
OLD | NEW |