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

Unified Diff: net/http/http_basic_stream.cc

Issue 4935001: Allow a non-200 (or non-407) response for a CONNECT request from an HTTPS pro... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years 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_basic_stream.cc
===================================================================
--- net/http/http_basic_stream.cc (revision 68959)
+++ net/http/http_basic_stream.cc (working copy)
@@ -16,8 +16,10 @@
namespace net {
HttpBasicStream::HttpBasicStream(ClientSocketHandle* connection,
+ HttpStreamParser* parser,
bool using_proxy)
: read_buf_(new GrowableIOBuffer()),
+ parser_(parser),
connection_(connection),
using_proxy_(using_proxy),
request_info_(NULL) {
@@ -26,6 +28,7 @@
int HttpBasicStream::InitializeStream(const HttpRequestInfo* request_info,
const BoundNetLog& net_log,
CompletionCallback* callback) {
+ DCHECK(!parser_.get());
request_info_ = request_info;
parser_.reset(new HttpStreamParser(connection_.get(), request_info,
read_buf_, net_log));
@@ -38,6 +41,7 @@
HttpResponseInfo* response,
CompletionCallback* callback) {
DCHECK(parser_.get());
+ DCHECK(request_info_);
const std::string path = using_proxy_ ?
HttpUtil::SpecForRequest(request_info_->url) :
HttpUtil::PathForRequest(request_info_->url);
@@ -75,7 +79,7 @@
DCHECK(IsResponseBodyComplete());
DCHECK(!IsMoreDataBuffered());
parser_.reset();
- return new HttpBasicStream(connection_.release(), using_proxy_);
+ return new HttpBasicStream(connection_.release(), NULL, using_proxy_);
}
bool HttpBasicStream::IsResponseBodyComplete() const {

Powered by Google App Engine
This is Rietveld 408576698