--- parser3/src/lib/smtp/comms.C	2004/07/28 14:38:20	1.6
+++ parser3/src/lib/smtp/comms.C	2012/03/16 09:24:12	1.9
@@ -1,14 +1,14 @@
 /** @file
 	Parser: SMTP sender impl.
 
-	Copyright (c) 2001-2004 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_COMMS_C="$Date: 2004/07/28 14:38:20 $";
-
 #include "smtp.h"
 
+volatile const char * IDENT_COMMS_C="$Id: comms.C,v 1.9 2012/03/16 09:24:12 moko Exp $";
+
 // ---------------------------------------------------------------------------
 int SMTP:: 
 IsAddressARawIpaddress(const char*  string)
@@ -107,15 +107,10 @@ GetAndSetTheSocket(SOCKET *the_socket)
 		return WSAESOCKTNOSUPPORT;
     }
 
-#ifdef SO_DONTLINGER
-    int dont_linger = 0;
-    setsockopt(*the_socket, SOL_SOCKET, SO_DONTLINGER, (const char *)&dont_linger, sizeof(dont_linger));
-#else
 	// To enable SO_DONTLINGER (that is, disable SO_LINGER) 
 	// l_onoff should be set to zero and setsockopt should be called
 	linger dont_linger={0,0};
     setsockopt(*the_socket, SOL_SOCKET, SO_LINGER, (const char *)&dont_linger, sizeof(dont_linger));
-#endif
 
     return 0;
 }