From 332a5bd4a155f6a8b75a8d743b3b144e264e42b7 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Fri, 16 Jul 2010 16:19:45 +0000 Subject: [PATCH] 2010-07-16 Tatsuhiro Tsujikawa Reverted previous change and fixed it in a right way. * src/HttpDownloadCommand.cc --- ChangeLog | 5 +++++ src/HttpDownloadCommand.cc | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2f632b39..30533bd8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-07-16 Tatsuhiro Tsujikawa + + Reverted previous change and fixed it in a right way. + * src/HttpDownloadCommand.cc + 2010-07-16 Tatsuhiro Tsujikawa Make sure that all decoders are finished to pool socket diff --git a/src/HttpDownloadCommand.cc b/src/HttpDownloadCommand.cc index 74c49f58..52ba1ed7 100644 --- a/src/HttpDownloadCommand.cc +++ b/src/HttpDownloadCommand.cc @@ -89,9 +89,10 @@ bool HttpDownloadCommand::prepareForNextSegment() { (getRequest()->isKeepAliveEnabled() && ( // Make sure that all decoders are finished to pool socket - ((getTransferEncodingDecoder().isNull() || - getTransferEncodingDecoder()->finished()) && - (getContentEncodingDecoder().isNull() || + ((!getTransferEncodingDecoder().isNull() && + getTransferEncodingDecoder()->finished()) || + (getTransferEncodingDecoder().isNull() && + !getContentEncodingDecoder().isNull() && getContentEncodingDecoder()->finished())) || getRequestEndOffset() == getFileEntry()->gtoloff(getSegments().front()->getPositionToWrite())