[Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/fileTP/...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       13/07/07 11:00:22

Modified files:
        distrib        : ChangeLog 
        src/networks/fileTP: fileTPFTP.ml 

Log message:
        patch #8108

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1572&r2=1.1573
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/fileTP/fileTPFTP.ml?cvsroot=mldonkey&r1=1.17&r2=1.18

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1572
retrieving revision 1.1573
diff -u -b -r1.1572 -r1.1573
--- distrib/ChangeLog   7 Jul 2013 10:58:31 -0000       1.1572
+++ distrib/ChangeLog   7 Jul 2013 11:00:21 -0000       1.1573
@@ -15,6 +15,7 @@
 =========
 
 2013/07/07:
+8108: FTP: fix authentication (ygrek)
 8107: HTML: fix "Request URI too large" errors (ygrek)
       drop unused selectPriority parameters
 8106: EDK: do not dump unknown messages by default (ygrek)

Index: src/networks/fileTP/fileTPFTP.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/fileTP/fileTPFTP.ml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- src/networks/fileTP/fileTPFTP.ml    17 Jun 2007 01:28:26 -0000      1.17
+++ src/networks/fileTP/fileTPFTP.ml    7 Jul 2013 11:00:21 -0000       1.18
@@ -55,20 +55,8 @@
 let default_user = "anonymous"
 let default_pass = "-mldonkey@"
 
-let get_user url = 
-  let url_user = url.Url.user in
-  let user = if url_user <> "" 
-    then url_user 
-    else default_user
-  in user
-
-let get_pass url = 
-  let url_pass = url.Url.passwd in
-  let pass = if url_pass <> "" 
-    then "-" ^ url_pass 
-    else default_pass
-  in pass
-
+let get_user url = if url.Url.user = "" then default_user else url.Url.user
+let get_pass url = if url.Url.passwd = "" then default_pass else url.Url.passwd
 
 let reg530 = Str.regexp ".*not connect more.*\\|.*too 
many.*\\|.*overloaded.*\\|.*try \\(again \\|back \\)?later.*\\|.*is restricted 
to.*\\|.*maximum number.*\\|.*only.*session.*allowed.*\\|.*more connection.*"