From 5ae219d33a8c5ac72023db425b5cfb56e9c4a6e3 Mon Sep 17 00:00:00 2001 From: lioux Date: Mon, 31 Jan 2005 02:47:22 +0000 Subject: o Fix patch #3676 from patch kit p with patch [2] from [1]: BT/fileTP HTTP header check [1] http://savannah.nongnu.org/patch/?func=detailitem&item_id=3676 [2] file 3676_2-fix.patch o Bump PORTREVISION --- net-p2p/mldonkey-devel/Makefile | 2 +- .../patch-src::networks::fileTP::fileTPInteractive.ml | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 net-p2p/mldonkey-devel/files/patch-src::networks::fileTP::fileTPInteractive.ml (limited to 'net-p2p/mldonkey-devel') diff --git a/net-p2p/mldonkey-devel/Makefile b/net-p2p/mldonkey-devel/Makefile index a81d381fe273..0f7fce27a254 100644 --- a/net-p2p/mldonkey-devel/Makefile +++ b/net-p2p/mldonkey-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= mldonkey PORTVERSION= 2.5.28.p -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES+= net MASTER_SITES= http://download.berlios.de/pub/mldonkey/spiralvoice/cvs/ PKGNAMESUFFIX= -devel diff --git a/net-p2p/mldonkey-devel/files/patch-src::networks::fileTP::fileTPInteractive.ml b/net-p2p/mldonkey-devel/files/patch-src::networks::fileTP::fileTPInteractive.ml new file mode 100644 index 000000000000..f799021ca7bb --- /dev/null +++ b/net-p2p/mldonkey-devel/files/patch-src::networks::fileTP::fileTPInteractive.ml @@ -0,0 +1,18 @@ +--- src/networks/fileTP/fileTPInteractive.ml.orig Mon Jan 31 00:29:00 2005 ++++ src/networks/fileTP/fileTPInteractive.ml Mon Jan 31 00:32:08 2005 +@@ -354,13 +354,13 @@ + + let rec op_network_parse_url url = + lprintf "filetp.op_network_parse_url\n"; +- let location_regexp = "Location: \([^\n]+\)\n" in ++ let location_regexp = "Location: \\(.*\\)" in + let real_url = get_regexp_string url (Str.regexp location_regexp) in + lprintf "real url: %s\n" real_url; + if (is_http_torrent url real_url) then false else + if (String2.check_prefix real_url "http://") then ( + lprintf "http download\n"; +- let length_regexp = "Content-Length: \([0-9]+\)\n" in ++ let length_regexp = "Content-Length: \\(.*\\)" in + try let length = get_regexp_int url (Str.regexp length_regexp) in + if (length > 0) then begin + download_file real_url; true -- cgit