diff options
Diffstat (limited to 'net/http/http_basic_stream.cc')
-rw-r--r-- | net/http/http_basic_stream.cc | 29 |
1 files changed, 7 insertions, 22 deletions
diff --git a/net/http/http_basic_stream.cc b/net/http/http_basic_stream.cc index 4303291..ecd692b 100644 --- a/net/http/http_basic_stream.cc +++ b/net/http/http_basic_stream.cc @@ -19,7 +19,6 @@ HttpBasicStream::HttpBasicStream(ClientSocketHandle* connection) int HttpBasicStream::InitializeStream(const HttpRequestInfo* request_info, const BoundNetLog& net_log, CompletionCallback* callback) { - DCHECK(!IsDetached()); parser_.reset(new HttpStreamParser(connection_.get(), request_info, read_buf_, net_log)); return OK; @@ -31,80 +30,66 @@ int HttpBasicStream::SendRequest(const std::string& headers, HttpResponseInfo* response, CompletionCallback* callback) { DCHECK(parser_.get()); - DCHECK(!IsDetached()); return parser_->SendRequest(headers, request_body, response, callback); } HttpBasicStream::~HttpBasicStream() {} uint64 HttpBasicStream::GetUploadProgress() const { - DCHECK(!IsDetached()); return parser_->GetUploadProgress(); } int HttpBasicStream::ReadResponseHeaders(CompletionCallback* callback) { - DCHECK(!IsDetached()); return parser_->ReadResponseHeaders(callback); } const HttpResponseInfo* HttpBasicStream::GetResponseInfo() const { - DCHECK(!IsDetached()); return parser_->GetResponseInfo(); } int HttpBasicStream::ReadResponseBody(IOBuffer* buf, int buf_len, CompletionCallback* callback) { - DCHECK(!IsDetached()); return parser_->ReadResponseBody(buf, buf_len, callback); } void HttpBasicStream::Close(bool not_reusable) { - DCHECK(!IsDetached()); parser_->Close(not_reusable); } +HttpStream* HttpBasicStream::RenewStreamForAuth() { + DCHECK(IsResponseBodyComplete()); + DCHECK(!IsMoreDataBuffered()); + parser_.reset(); + return new HttpBasicStream(connection_.release()); +} + bool HttpBasicStream::IsResponseBodyComplete() const { - DCHECK(!IsDetached()); return parser_->IsResponseBodyComplete(); } bool HttpBasicStream::CanFindEndOfResponse() const { - DCHECK(!IsDetached()); return parser_->CanFindEndOfResponse(); } bool HttpBasicStream::IsMoreDataBuffered() const { - DCHECK(!IsDetached()); return parser_->IsMoreDataBuffered(); } bool HttpBasicStream::IsConnectionReused() const { - DCHECK(!IsDetached()); return parser_->IsConnectionReused(); } void HttpBasicStream::SetConnectionReused() { - DCHECK(!IsDetached()); parser_->SetConnectionReused(); } -ClientSocketHandle* HttpBasicStream::DetachConnection() { - return connection_.release(); -} - void HttpBasicStream::GetSSLInfo(SSLInfo* ssl_info) { - DCHECK(!IsDetached()); parser_->GetSSLInfo(ssl_info); } void HttpBasicStream::GetSSLCertRequestInfo( SSLCertRequestInfo* cert_request_info) { - DCHECK(!IsDetached()); parser_->GetSSLCertRequestInfo(cert_request_info); } -bool HttpBasicStream::IsDetached() const { - return connection_.get() == NULL; -} - } // namespace net |