lftp-git.patch

   1 commit 9bb2bb4b480369184ac5ffb6202b85cbd63810d1
   2 Author: Alexander V. Lukyanov <lav@yars.free.net>
   3 Date:   Fri May 23 18:35:01 2014 +0400
   4
   5     fixed a compile error and incorrect disconnect cause with unexpanded %s
   6
   7 diff --git a/src/Torrent.cc b/src/Torrent.cc
   8 index 4eb1e4d..1ce4ea6 100644
   9 --- a/src/Torrent.cc
  10 +++ b/src/Torrent.cc
  11 @@ -2861,14 +2861,17 @@ int TorrentPeer::Do()
  12        if(s==UNPACK_NO_DATA_YET)
  13          return m;
  14        if(s!=UNPACK_SUCCESS) {
  15 -        const char *dc=0;
  16          if(s==UNPACK_PREMATURE_EOF) {
  17 -           if(recv_buf->Size()>0)
  18 -              LogError(2,dc=_("peer unexpectedly closed connection after %s"),recv_buf->Dump());
  19 -           else
  20 -              LogError(4,dc=_("peer closed connection (before handshake)"));
  21 +           if(recv_buf->Size()>0) {
  22 +              LogError(2,_("peer unexpectedly closed connection after %s"),recv_buf->Dump());
  23 +              Disconnect(_("peer unexpectedly closed connection"));
  24 +           } else {
  25 +              LogError(4,_("peer closed connection (before handshake)"));
  26 +              Disconnect(_("peer closed connection (before handshake)"));
  27 +           }
  28 +        } else {
  29 +           Disconnect(_("invalid peer response format"));
  30          }
  31 -        Disconnect(dc);
  32          return MOVED;
  33        }
  34        if(!parent->HasMetadata() && !LTEPExtensionEnabled()) {
  35 @@ -2976,12 +2979,13 @@ int TorrentPeer::Do()
  36        return m;
  37     if(st!=UNPACK_SUCCESS)
  38     {
  39 -      const char *dc=0;
  40 -      if(st==UNPACK_PREMATURE_EOF)
  41 -        LogError(2,dc=_("peer unexpectedly closed connection after %s"),recv_buf->Dump());
  42 -      else
  43 -        LogError(2,dc=_("invalid peer response format"));
  44 -      Disconnect(dc);
  45 +      if(st==UNPACK_PREMATURE_EOF) {
  46 +        LogError(2,_("peer unexpectedly closed connection after %s"),recv_buf->Dump());
  47 +        Disconnect(_("peer unexpectedly closed connection"));
  48 +      } else {
  49 +        LogError(2,_("invalid peer response format"));
  50 +        Disconnect(_("invalid peer response format"));
  51 +      }
  52        return MOVED;
  53     }
  54     reply->DropData(recv_buf);
  55 commit c6c77d67316126c79d446baff27aa3b3a2f8baa8
  56 Author: Alexander V. Lukyanov <lav@yars.free.net>
  57 Date:   Mon May 26 11:02:40 2014 +0400
  58
  59     fixed redirection handling
  60
  61 diff --git a/src/FileCopy.cc b/src/FileCopy.cc
  62 index f7e774c..30c2bdb 100644
  63 --- a/src/FileCopy.cc
  64 +++ b/src/FileCopy.cc
  65 @@ -1134,7 +1134,7 @@ int FileCopyPeerFA::Get_LL(int len)
  66             if(FAmode==FA::QUOTE_CMD)
  67                FAmode=FA::RETRIEVE;
  68
  69 -           xstring& loc=xstring::get_tmp(loc_c);
  70 +           xstring loc(loc_c);
  71             session->Close(); // loc_c is no longer valid.
  72             loc_c=0;
  73