diff options
Diffstat (limited to 'net/http/http_stream_parser.cc')
| -rw-r--r-- | net/http/http_stream_parser.cc | 39 |
1 files changed, 4 insertions, 35 deletions
diff --git a/net/http/http_stream_parser.cc b/net/http/http_stream_parser.cc index 5d0d9ed..0649bce 100644 --- a/net/http/http_stream_parser.cc +++ b/net/http/http_stream_parser.cc @@ -1,5 +1,4 @@ // Copyright (c) 2011 The Chromium Authors. All rights reserved. -// Copyright (c) 2012, Code Aurora Forum. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -19,15 +18,13 @@ #include "net/http/http_util.h" #include "net/socket/ssl_client_socket.h" #include "net/socket/client_socket_handle.h" -#include "net/http/http_getzip_factory.h" namespace net { HttpStreamParser::HttpStreamParser(ClientSocketHandle* connection, const HttpRequestInfo* request, GrowableIOBuffer* read_buffer, - const BoundNetLog& net_log, - bool using_proxy) + const BoundNetLog& net_log) : io_state_(STATE_NONE), request_(request), request_headers_(NULL), @@ -47,10 +44,7 @@ HttpStreamParser::HttpStreamParser(ClientSocketHandle* connection, io_callback_(this, &HttpStreamParser::OnIOComplete)), chunk_length_(0), chunk_length_without_encoding_(0), - sent_last_chunk_(false), - using_proxy_(using_proxy), - has_to_retry_(false){ - + sent_last_chunk_(false) { DCHECK_EQ(0, read_buffer->offset()); } @@ -68,7 +62,7 @@ int HttpStreamParser::SendRequest(const std::string& request_line, DCHECK(!user_callback_); DCHECK(callback); DCHECK(response); - has_to_retry_ = false; + if (net_log_.IsLoggingAllEvents()) { net_log_.AddEvent( NetLog::TYPE_HTTP_TRANSACTION_SEND_REQUEST_HEADERS, @@ -84,15 +78,6 @@ int HttpStreamParser::SendRequest(const std::string& request_line, return result; response_->socket_address = HostPortPair::FromAddrInfo(address.head()); - //Shutr only for GET/HEAD requests - if((!(using_proxy_)) && ((request_line.find(HttpRequestHeaders::kGetMethod) == 0) || - (request_line.find(HttpRequestHeaders::kHeadMethod) == 0))) - { - HttpGetZipFactory::GetGETZipManager()->CompressRequestHeaders( - const_cast<HttpRequestHeaders &>(headers), - connection_->socket()); - } - std::string request = request_line + headers.ToString(); scoped_refptr<StringIOBuffer> headers_io_buf(new StringIOBuffer(request)); request_headers_ = new DrainableIOBuffer(headers_io_buf, @@ -176,11 +161,6 @@ void HttpStreamParser::OnIOComplete(int result) { if (result != ERR_IO_PENDING && user_callback_) { CompletionCallback* c = user_callback_; user_callback_ = NULL; - if(has_to_retry_ ) - { - result = ERR_GETZIP; - has_to_retry_ = false; - } c->Run(result); } } @@ -221,19 +201,8 @@ int HttpStreamParser::DoLoop(int result) { break; case STATE_READ_HEADERS_COMPLETE: result = DoReadHeadersComplete(result); - if(!using_proxy_) - { - GETZipDecompressionStatus st = - HttpGetZipFactory::GetGETZipManager()->DecompressResponseHeaders( - response_->headers.get(), - connection_->socket()); - if( st == REQUEST_RETRY_NEEDED ) - { - has_to_retry_ = true; - } - } net_log_.EndEventWithNetErrorCode( - NetLog::TYPE_HTTP_STREAM_PARSER_READ_HEADERS, result); + NetLog::TYPE_HTTP_STREAM_PARSER_READ_HEADERS, result); break; case STATE_BODY_PENDING: DCHECK(result != ERR_IO_PENDING); |