diff options
| author | tyoshino@chromium.org <tyoshino@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-12 03:36:40 +0000 |
|---|---|---|
| committer | tyoshino@chromium.org <tyoshino@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-12 03:36:40 +0000 |
| commit | 169ad2ed31d274eb7718ff731143f28b79ead842 (patch) | |
| tree | 204dcf56a8b13262024bb86da9fa121ca6abbbfd | |
| parent | d0608ca9ea1521a42efceef0c092197348ca54d5 (diff) | |
| download | chromium_src-169ad2ed31d274eb7718ff731143f28b79ead842.zip chromium_src-169ad2ed31d274eb7718ff731143f28b79ead842.tar.gz chromium_src-169ad2ed31d274eb7718ff731143f28b79ead842.tar.bz2 | |
Merge 288118 "Return ERR_NOT_IMPLEMENTED when we reach SPDY stre..."
> Return ERR_NOT_IMPLEMENTED when we reach SPDY stream creation code in a factory for WebSocket
>
> BUG=394434
>
> Review URL: https://codereview.chromium.org/440293003
TBR=tyoshino@chromium.org
Review URL: https://codereview.chromium.org/459343002
git-svn-id: svn://svn.chromium.org/chrome/branches/2062/src@288903 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | net/http/http_stream_factory_impl_job.cc | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/net/http/http_stream_factory_impl_job.cc b/net/http/http_stream_factory_impl_job.cc index 79a9536..1d8237c 100644 --- a/net/http/http_stream_factory_impl_job.cc +++ b/net/http/http_stream_factory_impl_job.cc @@ -1124,13 +1124,14 @@ int HttpStreamFactoryImpl::Job::DoCreateStream() { // HttpStreamFactoryImpl will be creating all the SpdyHttpStreams, since it // will know when SpdySessions become available. - if (stream_factory_->for_websockets_) { - // TODO(ricea): Restore this code when WebSockets over SPDY is implemented. - NOTREACHED(); - } else { - bool use_relative_url = direct || request_info_.url.SchemeIs("https"); - stream_.reset(new SpdyHttpStream(spdy_session, use_relative_url)); - } + // TODO(ricea): Restore the code for WebSockets over SPDY once it's + // implemented. + if (stream_factory_->for_websockets_) + return ERR_NOT_IMPLEMENTED; + + bool use_relative_url = direct || request_info_.url.SchemeIs("https"); + stream_.reset(new SpdyHttpStream(spdy_session, use_relative_url)); + return OK; } |