0.2.1+2

2 files changed, 4 insertions, 2 deletions

diff --git a/src/HttpResponseCommand.cc b/src/HttpResponseCommand.cc
index 30e65db1..fd2526b8 100644
--- a/src/HttpResponseCommand.cc
+++ b/src/HttpResponseCommand.cc
@@ -37,7 +37,7 @@ HttpResponseCommand::~HttpResponseCommand() {
 }
 
 bool HttpResponseCommand::executeInternal(Segment seg) {
-  if(SEGMENT_EQUAL(req->seg, seg) == false) {
+  if(req->seg.sp != seg.sp) {
     e->logger->info(MSG_SEGMENT_CHANGED, cuid);
     return prepareForRetry(0);
   }
@@ -104,6 +104,8 @@ bool HttpResponseCommand::handleDefaultEncoding(const HttpHeader& headers) {
     return prepareForRetry(0);
   } else {
     e->segmentMan->totalSize = size;
+    Segment seg;
+    e->segmentMan->getSegment(seg, cuid);	
     e->diskWriter->initAndOpenFile(e->segmentMan->getFilePath());
     createHttpDownloadCommand();
     return true;
diff --git a/src/Util.cc b/src/Util.cc
index e19ef451..5db1bcec 100644
--- a/src/Util.cc
+++ b/src/Util.cc
@@ -122,7 +122,7 @@ bool Util::endsWith(string target, string part) {
   if(part == "") {
     return true;
   }
-  if(target.find(part) == target.size()-part.size()) {
+  if(target.rfind(part) == target.size()-part.size()) {
     return true;
   } else {
     return false;