| Index: net/http/http_stream_factory_impl.cc
|
| diff --git a/net/http/http_stream_factory_impl.cc b/net/http/http_stream_factory_impl.cc
|
| index 92253920973e7148972ae61af2303f2f6bd802fa..3b2cff04b886827d9702e7d7b944ed004d7dc267 100644
|
| --- a/net/http/http_stream_factory_impl.cc
|
| +++ b/net/http/http_stream_factory_impl.cc
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "net/http/http_stream_factory_impl.h"
|
|
|
| +#include <string>
|
| +
|
| #include "base/string_number_conversions.h"
|
| #include "base/stl_util.h"
|
| #include "googleurl/src/gurl.h"
|
| @@ -68,7 +70,41 @@ HttpStreamRequest* HttpStreamFactoryImpl::RequestStream(
|
| const SSLConfig& proxy_ssl_config,
|
| HttpStreamRequest::Delegate* delegate,
|
| const BoundNetLog& net_log) {
|
| - Request* request = new Request(request_info.url, this, delegate, net_log);
|
| + return RequestStreamInternal(request_info,
|
| + priority,
|
| + server_ssl_config,
|
| + proxy_ssl_config,
|
| + delegate,
|
| + net_log,
|
| + false);
|
| +}
|
| +
|
| +HttpStreamRequest* HttpStreamFactoryImpl::RequestStreamForWebSocket(
|
| + const HttpRequestInfo& request_info,
|
| + RequestPriority priority,
|
| + const SSLConfig& server_ssl_config,
|
| + const SSLConfig& proxy_ssl_config,
|
| + HttpStreamRequest::Delegate* delegate,
|
| + const BoundNetLog& net_log) {
|
| + return RequestStreamInternal(request_info,
|
| + priority,
|
| + server_ssl_config,
|
| + proxy_ssl_config,
|
| + delegate,
|
| + net_log,
|
| + true);
|
| +}
|
| +
|
| +HttpStreamRequest* HttpStreamFactoryImpl::RequestStreamInternal(
|
| + const HttpRequestInfo& request_info,
|
| + RequestPriority priority,
|
| + const SSLConfig& server_ssl_config,
|
| + const SSLConfig& proxy_ssl_config,
|
| + HttpStreamRequest::Delegate* delegate,
|
| + const BoundNetLog& net_log,
|
| + bool for_websocket) {
|
| + Request* request =
|
| + new Request(request_info.url, this, delegate, net_log, for_websocket);
|
|
|
| GURL alternate_url;
|
| PortAlternateProtocolPair alternate =
|
| @@ -198,7 +234,7 @@ PortAlternateProtocolPair HttpStreamFactoryImpl::GetAlternateProtocolRequestFor(
|
| // for the proxy to use to reach the original URL via TCP. But
|
| // the alternate request will be going via UDP to a different port.
|
| *alternate_url = original_url;
|
| - }
|
| + }
|
| return alternate;
|
| }
|
|
|
|
|