[Mldonkey-commits] mldonkey distrib/ChangeLog src/utils/net/mailer.ml

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    06/05/31 20:24:52

Modified files:
        distrib        : ChangeLog 
        src/utils/net  : mailer.ml 

Log message:
        patch #5148

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.864&tr2=1.865&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/utils/net/mailer.ml.diff?tr1=1.10&tr2=1.11&r1=text&r2=text

Patches:
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.864 mldonkey/distrib/ChangeLog:1.865
--- mldonkey/distrib/ChangeLog:1.864    Wed May 31 20:06:02 2006
+++ mldonkey/distrib/ChangeLog  Wed May 31 20:24:52 2006
@@ -15,6 +15,7 @@
 =========
 
 2006/05/31
+5148: Mail: Fix for multiline SMTP responses (zet)
 5143: HTML/Telnet: Country codes for servers
 5147: G1/G2: Display proper filename (and therefore support rename) (zet)
 5145: EDK: Fix md4 hashing when filesize is an exact multiple
Index: mldonkey/src/utils/net/mailer.ml
diff -u mldonkey/src/utils/net/mailer.ml:1.10 
mldonkey/src/utils/net/mailer.ml:1.11
--- mldonkey/src/utils/net/mailer.ml:1.10       Mon Apr  3 20:52:17 2006
+++ mldonkey/src/utils/net/mailer.ml    Wed May 31 20:24:52 2006
@@ -90,11 +90,17 @@
       (String.escaped !last_response))
   
 let read_response ic =
+  let rec iter () =
   last_response := input_line ic;
-  if String.length !last_response > 3 then
-    int_of_string (String.sub !last_response 0 3)
+    if String.length !last_response > 3 then begin
+      (* Ignore extended text *)
+      if (String.sub !last_response 3 1) = "-"
+        then iter ()
+        else int_of_string (String.sub !last_response 0 3)
+    end
   else 
     bad_response ()
+  in iter ()
 
 let make_mail mail new_style =
   let mail_date = Date.mail_string (Unix.time ()) in