| 1 |
jer 14/05/23 16:06:37 |
| 2 |
|
| 3 |
Added: lftp-4.5.0-Torrent.patch |
| 4 |
Log: |
| 5 |
Add upstream patch. |
| 6 |
|
| 7 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 net-ftp/lftp/files/lftp-4.5.0-Torrent.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/lftp/files/lftp-4.5.0-Torrent.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/lftp/files/lftp-4.5.0-Torrent.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: lftp-4.5.0-Torrent.patch |
| 16 |
=================================================================== |
| 17 |
--- a/src/Torrent.cc |
| 18 |
+++ b/src/Torrent.cc |
| 19 |
@@ -2861,14 +2861,17 @@ int TorrentPeer::Do() |
| 20 |
if(s==UNPACK_NO_DATA_YET) |
| 21 |
return m; |
| 22 |
if(s!=UNPACK_SUCCESS) { |
| 23 |
- const char *dc=0; |
| 24 |
if(s==UNPACK_PREMATURE_EOF) { |
| 25 |
- if(recv_buf->Size()>0) |
| 26 |
- LogError(2,dc=_("peer unexpectedly closed connection after %s"),recv_buf->Dump()); |
| 27 |
- else |
| 28 |
- LogError(4,dc=_("peer closed connection (before handshake)")); |
| 29 |
+ if(recv_buf->Size()>0) { |
| 30 |
+ LogError(2,_("peer unexpectedly closed connection after %s"),recv_buf->Dump()); |
| 31 |
+ Disconnect(_("peer unexpectedly closed connection")); |
| 32 |
+ } else { |
| 33 |
+ LogError(4,_("peer closed connection (before handshake)")); |
| 34 |
+ Disconnect(_("peer closed connection (before handshake)")); |
| 35 |
+ } |
| 36 |
+ } else { |
| 37 |
+ Disconnect(_("invalid peer response format")); |
| 38 |
} |
| 39 |
- Disconnect(dc); |
| 40 |
return MOVED; |
| 41 |
} |
| 42 |
if(!parent->HasMetadata() && !LTEPExtensionEnabled()) { |
| 43 |
@@ -2976,12 +2979,13 @@ int TorrentPeer::Do() |
| 44 |
return m; |
| 45 |
if(st!=UNPACK_SUCCESS) |
| 46 |
{ |
| 47 |
- const char *dc=0; |
| 48 |
- if(st==UNPACK_PREMATURE_EOF) |
| 49 |
- LogError(2,dc=_("peer unexpectedly closed connection after %s"),recv_buf->Dump()); |
| 50 |
- else |
| 51 |
- LogError(2,dc=_("invalid peer response format")); |
| 52 |
- Disconnect(dc); |
| 53 |
+ if(st==UNPACK_PREMATURE_EOF) { |
| 54 |
+ LogError(2,_("peer unexpectedly closed connection after %s"),recv_buf->Dump()); |
| 55 |
+ Disconnect(_("peer unexpectedly closed connection")); |
| 56 |
+ } else { |
| 57 |
+ LogError(2,_("invalid peer response format")); |
| 58 |
+ Disconnect(_("invalid peer response format")); |
| 59 |
+ } |
| 60 |
return MOVED; |
| 61 |
} |
| 62 |
reply->DropData(recv_buf); |
Archives