[Python-checkins] r84237 - in python/branches/py3k: Lib/smtpd.py Misc/NEWS

[giampaolo.rodola]

Author: giampaolo.rodola
Date: Sat Aug 21 20:47:59 2010
New Revision: 84237

Log:
revert changes made in r84236 committed by accident

Modified:
   python/branches/py3k/Lib/smtpd.py
   python/branches/py3k/Misc/NEWS

Modified: python/branches/py3k/Lib/smtpd.py
==============================================================================
--- python/branches/py3k/Lib/smtpd.py	(original)
+++ python/branches/py3k/Lib/smtpd.py	Sat Aug 21 20:47:59 2010
@@ -414,20 +414,7 @@
                 localaddr, remoteaddr), file=DEBUGSTREAM)
 
     def handle_accept(self)
-        try:
-            conn, addr = self.accept()
-        except TypeError:
-            # sometimes accept() might return None
-            return
-        except socket.error, err:
-            # ECONNABORTED might be thrown
-            if err[0] != errno.ECONNABORTED:
-                raise
-            return
-        else:
-            # sometimes addr == None instead of (ip, port)
-            if addr == None:
-                return
+        conn, addr = self.accept()
         print('Incoming connection from %s' % repr(addr), file=DEBUGSTREAM)
         channel = self.channel_class(self, conn, addr)
 

Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Sat Aug 21 20:47:59 2010
@@ -117,9 +117,6 @@
 Library
 -------
 
-- Issue #9129: smtpd.py module is vulnerable to DoS attacks due to missing 
-  error handling when accepting new connections.
-
 - Issue #843590: Make "macintosh" an alias to the "mac_roman" encoding.
 
 - Create os.fsdecode(): decode from the filesystem encoding with