From c682371a582386b022fe3cfc0d72782356aa1841 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Tue, 30 Sep 2008 15:54:50 +0000 Subject: 2008-10-01 Tatsuhiro Tsujikawa Don't set Request::supportsPersistentConnection() in HttpConnection since this code is also used in AbstractProxyResponseCommand. Moved those code to HttpResponse. * src/HttpResponse.cc * src/HttpResponse.h * src/HttpConnection.cc * src/HttpConnection.h * src/HttpResponseCommand.cc * test/HttpResponseTest.cc --- src/HttpConnection.cc | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'src/HttpConnection.cc') diff --git a/src/HttpConnection.cc b/src/HttpConnection.cc index 26bb50cd..833e6e6d 100644 --- a/src/HttpConnection.cc +++ b/src/HttpConnection.cc @@ -33,6 +33,9 @@ */ /* copyright --> */ #include "HttpConnection.h" + +#include + #include "Util.h" #include "message.h" #include "prefs.h" @@ -49,7 +52,6 @@ #include "Socket.h" #include "Option.h" #include "CookieStorage.h" -#include namespace aria2 { @@ -141,19 +143,8 @@ HttpResponseHandle HttpConnection::receiveResponse() size -= putbackDataLength; socket->readData(buf, size); - // OK, we got all headers. logger->info(MSG_RECEIVE_RESPONSE, cuid, proc->getHeaderString().c_str()); - // Disable persistent connection if: - // Connection: close is received or the remote server is not HTTP/1.1. - // We don't care whether non-HTTP/1.1 server returns Connection: keep-alive. SharedHandle httpHeader = proc->getHttpResponseHeader(); - if(Util::toLower(httpHeader->getFirst(HttpHeader::CONNECTION)).find(HttpHeader::CLOSE) != std::string::npos - || httpHeader->getVersion() != HttpHeader::HTTP_1_1) { - entry->getHttpRequest()->getRequest()->supportsPersistentConnection(false); - } else { - entry->getHttpRequest()->getRequest()->supportsPersistentConnection(true); - } - HttpResponseHandle httpResponse(new HttpResponse()); httpResponse->setCuid(cuid); httpResponse->setHttpHeader(httpHeader); -- cgit