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

Unified Diff: net/http/http_stream_factory_impl_job.cc

Issue 6800009: Attn: Mike Belshe Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Created 9 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: net/http/http_stream_factory_impl_job.cc
===================================================================
--- net/http/http_stream_factory_impl_job.cc (revision 80449)
+++ net/http/http_stream_factory_impl_job.cc (working copy)
@@ -21,6 +21,7 @@
#include "net/http/http_stream_factory_impl_request.h"
#include "net/socket/client_socket_handle.h"
#include "net/socket/client_socket_pool.h"
+#include "net/socket/sctp_support.h"
#include "net/socket/socks_client_socket_pool.h"
#include "net/socket/ssl_client_socket.h"
#include "net/socket/ssl_client_socket_pool.h"
@@ -64,7 +65,7 @@
spdy_session_direct_(false),
ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) {
DCHECK(stream_factory);
- DCHECK(session);
+ CHECK(session);
Mike Belshe 2011/04/06 18:32:53 nit: accidental?
}
HttpStreamFactoryImpl::Job::~Job() {
@@ -527,7 +528,10 @@
DCHECK(proxy_info_.proxy_server().is_valid());
next_state_ = STATE_INIT_CONNECTION_COMPLETE;
- using_ssl_ = request_info_.url.SchemeIs("https") || ShouldForceSpdySSL();
+ if (sctp_enabled())
+ using_ssl_ = false;
+ else
+ using_ssl_ = request_info_.url.SchemeIs("https") || ShouldForceSpdySSL();
using_spdy_ = false;
// Check first if we have a spdy session for this group. If so, then go

Powered by Google App Engine
This is Rietveld 408576698