[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/driver/dr...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/10/06 15:55:37

Modified files:
        distrib        : ChangeLog 
        src/daemon/driver: driverControlers.ml 

Log message:
        patch #5440

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1039&r2=1.1040
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverControlers.ml?cvsroot=mldonkey&r1=1.87&r2=1.88

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1039
retrieving revision 1.1040
diff -u -b -r1.1039 -r1.1040
--- distrib/ChangeLog   3 Oct 2006 15:23:08 -0000       1.1039
+++ distrib/ChangeLog   6 Oct 2006 15:55:37 -0000       1.1040
@@ -14,6 +14,9 @@
 ChangeLog
 =========
 
+2006/10/06
+5440: HTML: Strip CR from multiline dllink input to fix FileTP filenames
+
 2006/10/03
 5439: Increase required ocaml version to 3.09.3 (schlumpf),
       remove old TYPE_FORMAT stuff needed for Ocaml < 3.06 (pango)

Index: src/daemon/driver/driverControlers.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverControlers.ml,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -b -r1.87 -r1.88
--- src/daemon/driver/driverControlers.ml       1 Oct 2006 17:53:59 -0000       
1.87
+++ src/daemon/driver/driverControlers.ml       6 Oct 2006 15:55:37 -0000       
1.88
@@ -1331,7 +1331,8 @@
                 | [ "jvcmd", "multidllink" ; "links", links] ->
                     html_open_page buf t r true;
                     List.iter (fun url ->
-                     if url <> "\013" && url <> "" then
+                     let url = fst (String2.cut_at url '\013') in
+                     if url <> "" then
                        begin
                           Buffer.add_string buf (html_escaped (dllink_parse 
(o.conn_output = HTML) url o.conn_user.ui_user_name));
                           Buffer.add_string buf (html_escaped "\\<P\\>")