| 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 "net/http/http_stream_factory_impl.h" | 5 #include "net/http/http_stream_factory_impl.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/stl_util.h" | 10 #include "base/stl_util.h" |
| (...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 221 if (!HttpStreamFactory::spdy_enabled()) | 221 if (!HttpStreamFactory::spdy_enabled()) |
| 222 return kNoAlternateProtocol; | 222 return kNoAlternateProtocol; |
| 223 | 223 |
| 224 if (session_->HasSpdyExclusion(origin)) | 224 if (session_->HasSpdyExclusion(origin)) |
| 225 return kNoAlternateProtocol; | 225 return kNoAlternateProtocol; |
| 226 | 226 |
| 227 *alternate_url = UpgradeUrlToHttps(original_url, alternate.port); | 227 *alternate_url = UpgradeUrlToHttps(original_url, alternate.port); |
| 228 } else { | 228 } else { |
| 229 DCHECK_EQ(QUIC, alternate.protocol); | 229 DCHECK_EQ(QUIC, alternate.protocol); |
| 230 if (!session_->params().enable_quic) | 230 if (!session_->params().enable_quic) |
| 231 return kNoAlternateProtocol; | 231 return kNoAlternateProtocol; |
| 232 | 232 |
| 233 // TODO(rch): Figure out how to make QUIC iteract with PAC | 233 // TODO(rch): Figure out how to make QUIC iteract with PAC |
| 234 // scripts. By not re-writing the URL, we will query the PAC script | 234 // scripts. By not re-writing the URL, we will query the PAC script |
| 235 // for the proxy to use to reach the original URL via TCP. But | 235 // for the proxy to use to reach the original URL via TCP. But |
| 236 // the alternate request will be going via UDP to a different port. | 236 // the alternate request will be going via UDP to a different port. |
| 237 *alternate_url = original_url; | 237 *alternate_url = original_url; |
| 238 } | 238 } |
| 239 return alternate; | 239 return alternate; |
| 240 } | 240 } |
| 241 | 241 |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 298 delete job; | 298 delete job; |
| 299 } | 299 } |
| 300 | 300 |
| 301 void HttpStreamFactoryImpl::OnPreconnectsComplete(const Job* job) { | 301 void HttpStreamFactoryImpl::OnPreconnectsComplete(const Job* job) { |
| 302 preconnect_job_set_.erase(job); | 302 preconnect_job_set_.erase(job); |
| 303 delete job; | 303 delete job; |
| 304 OnPreconnectsCompleteInternal(); | 304 OnPreconnectsCompleteInternal(); |
| 305 } | 305 } |
| 306 | 306 |
| 307 } // namespace net | 307 } // namespace net |
| OLD | NEW |