--- a/CHANGES.txt	Wed Apr 23 12:12:22 2003 +0000
+++ b/CHANGES.txt	Thu Apr 24 04:28:33 2003 +0000
@@ -97,6 +97,7 @@
 - can now unset values in CSV editing (sf bug 704788)
 - fixed rdbms email address lookup (case insensitivity)
 - email file attachments added to issue files list (sf bug 711501)
+- added socket timeout to attempt to prevent stuck processes (sf bug 665487)
 
 
 2003-02-27 0.5.6

--- a/roundup/scripts/roundup_admin.py	Wed Apr 23 12:12:22 2003 +0000
+++ b/roundup/scripts/roundup_admin.py	Thu Apr 24 04:28:33 2003 +0000
@@ -14,7 +14,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: roundup_admin.py,v 1.4 2002-09-10 01:07:06 richard Exp $
+# $Id: roundup_admin.py,v 1.5 2003-04-24 04:27:32 richard Exp $
 
 # python version check
 from roundup import version_check
@@ -26,6 +26,10 @@
 import sys
 
 def run():
+    # time out after a minute if we can
+    import socket
+    if hasattr(socket, 'setdefaulttimeout'):
+        socket.setdefaulttimeout(60)
     tool = AdminTool()
     sys.exit(tool.main())
 

--- a/roundup/scripts/roundup_mailgw.py	Wed Apr 23 12:12:22 2003 +0000
+++ b/roundup/scripts/roundup_mailgw.py	Thu Apr 24 04:28:33 2003 +0000
@@ -14,7 +14,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: roundup_mailgw.py,v 1.9 2003-03-24 02:56:30 richard Exp $
+# $Id: roundup_mailgw.py,v 1.10 2003-04-24 04:27:32 richard Exp $
 
 # python version check
 from roundup import version_check
@@ -136,6 +136,10 @@
         db.close()
 
 def run():
+    # time out after a minute if we can
+    import socket
+    if hasattr(socket, 'setdefaulttimeout'):
+        socket.setdefaulttimeout(60)
     sys.exit(main(sys.argv))
 
 # call main

--- a/roundup/scripts/roundup_server.py	Wed Apr 23 12:12:22 2003 +0000
+++ b/roundup/scripts/roundup_server.py	Thu Apr 24 04:28:33 2003 +0000
@@ -16,7 +16,7 @@
 # 
 """ HTTP Server that serves roundup.
 
-$Id: roundup_server.py,v 1.21 2003-03-26 04:54:59 richard Exp $
+$Id: roundup_server.py,v 1.22 2003-04-24 04:27:32 richard Exp $
 """
 
 # python version check
@@ -254,6 +254,11 @@
 def run():
     ''' Script entry point - handle args and figure out what to to.
     '''
+    # time out after a minute if we can
+    import socket
+    if hasattr(socket, 'setdefaulttimeout'):
+        socket.setdefaulttimeout(60)
+
     hostname = ''
     port = 8080
     pidfile = None