- rel 2; fix http redir handling

[packages/lftp.git] / lftp-git.patch

commit 9bb2bb4b480369184ac5ffb6202b85cbd63810d1
Author: Alexander V. Lukyanov <lav@yars.free.net>
Date:   Fri May 23 18:35:01 2014 +0400

    fixed a compile error and incorrect disconnect cause with unexpanded %s

diff --git a/src/Torrent.cc b/src/Torrent.cc
index 4eb1e4d..1ce4ea6 100644
--- a/src/Torrent.cc
+++ b/src/Torrent.cc
@@ -2861,14 +2861,17 @@ int TorrentPeer::Do()
       if(s==UNPACK_NO_DATA_YET)
 	 return m;
       if(s!=UNPACK_SUCCESS) {
-	 const char *dc=0;
 	 if(s==UNPACK_PREMATURE_EOF) {
-	    if(recv_buf->Size()>0)
-	       LogError(2,dc=_("peer unexpectedly closed connection after %s"),recv_buf->Dump());
-	    else
-	       LogError(4,dc=_("peer closed connection (before handshake)"));
+	    if(recv_buf->Size()>0) {
+	       LogError(2,_("peer unexpectedly closed connection after %s"),recv_buf->Dump());
+	       Disconnect(_("peer unexpectedly closed connection"));
+	    } else {
+	       LogError(4,_("peer closed connection (before handshake)"));
+	       Disconnect(_("peer closed connection (before handshake)"));
+	    }
+	 } else {
+	    Disconnect(_("invalid peer response format"));
 	 }
-	 Disconnect(dc);
 	 return MOVED;
       }
       if(!parent->HasMetadata() && !LTEPExtensionEnabled()) {
@@ -2976,12 +2979,13 @@ int TorrentPeer::Do()
       return m;
    if(st!=UNPACK_SUCCESS)
    {
-      const char *dc=0;
-      if(st==UNPACK_PREMATURE_EOF)
-	 LogError(2,dc=_("peer unexpectedly closed connection after %s"),recv_buf->Dump());
-      else
-	 LogError(2,dc=_("invalid peer response format"));
-      Disconnect(dc);
+      if(st==UNPACK_PREMATURE_EOF) {
+	 LogError(2,_("peer unexpectedly closed connection after %s"),recv_buf->Dump());
+	 Disconnect(_("peer unexpectedly closed connection"));
+      } else {
+	 LogError(2,_("invalid peer response format"));
+	 Disconnect(_("invalid peer response format"));
+      }
       return MOVED;
    }
    reply->DropData(recv_buf);
commit c6c77d67316126c79d446baff27aa3b3a2f8baa8
Author: Alexander V. Lukyanov <lav@yars.free.net>
Date:   Mon May 26 11:02:40 2014 +0400

    fixed redirection handling

diff --git a/src/FileCopy.cc b/src/FileCopy.cc
index f7e774c..30c2bdb 100644
--- a/src/FileCopy.cc
+++ b/src/FileCopy.cc
@@ -1134,7 +1134,7 @@ int FileCopyPeerFA::Get_LL(int len)
 	    if(FAmode==FA::QUOTE_CMD)
 	       FAmode=FA::RETRIEVE;
 
-	    xstring& loc=xstring::get_tmp(loc_c);
+	    xstring loc(loc_c);
 	    session->Close(); // loc_c is no longer valid.
 	    loc_c=0;