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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       10/12/22 10:04:58

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

Log message:
        patch #7418

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1508&r2=1.1509
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/net/mailer.ml?cvsroot=mldonkey&r1=1.14&r2=1.15

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1508
retrieving revision 1.1509
diff -u -b -r1.1508 -r1.1509
--- distrib/ChangeLog   19 Dec 2010 10:34:28 -0000      1.1508
+++ distrib/ChangeLog   22 Dec 2010 10:04:56 -0000      1.1509
@@ -14,6 +14,9 @@
 ChangeLog
 =========
 
+2010/12/22
+7418: Ignore setsockopt_float exception while sending mail
+
 2010/12/19
 7303: UPNP: added BT_tracker-port
 7418: SMTP auth implementation (ygrek)

Index: src/utils/net/mailer.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/utils/net/mailer.ml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- src/utils/net/mailer.ml     19 Dec 2010 10:31:22 -0000      1.14
+++ src/utils/net/mailer.ml     22 Dec 2010 10:04:57 -0000      1.15
@@ -160,8 +160,8 @@
 (* a completely synchronous function (BUG) *)
   try
     let s = simple_connect smtp_server smtp_port in
-    Unix.setsockopt_float s Unix.SO_RCVTIMEO 30.;
-    Unix.setsockopt_float s Unix.SO_SNDTIMEO 30.;
+    (try Unix.setsockopt_float s Unix.SO_RCVTIMEO 30. with _ -> ());
+    (try Unix.setsockopt_float s Unix.SO_SNDTIMEO 30. with _ -> ());
     let ic = in_channel_of_descr s in
     let oc = out_channel_of_descr s in
     let auth_login_enabled = ref false in