From 3886919101508ea44884d13df0f260caf615153e Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Fri, 16 Jul 2010 15:19:46 +0000 Subject: [PATCH] 2010-07-16 Tatsuhiro Tsujikawa Make sure that all decoders are finished to pool socket * src/HttpDownloadCommand.cc --- ChangeLog | 5 +++++ src/HttpDownloadCommand.cc | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0a45e525..2f632b39 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-07-16 Tatsuhiro Tsujikawa + + Make sure that all decoders are finished to pool socket + * src/HttpDownloadCommand.cc + 2010-07-16 Tatsuhiro Tsujikawa Fixed indent of --conditional-get option. diff --git a/src/HttpDownloadCommand.cc b/src/HttpDownloadCommand.cc index 9e4798e4..74c49f58 100644 --- a/src/HttpDownloadCommand.cc +++ b/src/HttpDownloadCommand.cc @@ -88,10 +88,10 @@ bool HttpDownloadCommand::prepareForNextSegment() { if(getRequest()->isPipeliningEnabled() || (getRequest()->isKeepAliveEnabled() && ( - // TODO make sure that all decoder is finished to pool socket - ((!getTransferEncodingDecoder().isNull() && - getTransferEncodingDecoder()->finished()) || - (!getContentEncodingDecoder().isNull() && + // Make sure that all decoders are finished to pool socket + ((getTransferEncodingDecoder().isNull() || + getTransferEncodingDecoder()->finished()) && + (getContentEncodingDecoder().isNull() || getContentEncodingDecoder()->finished())) || getRequestEndOffset() == getFileEntry()->gtoloff(getSegments().front()->getPositionToWrite())