Please review this at http://codereview.appspot.com/2484043/

Affected files:
  M trytond/protocols/jsonrpc.py
  M trytond/protocols/webdav.py
  M trytond/protocols/xmlrpc.py


Index: trytond/protocols/jsonrpc.py
===================================================================
--- a/trytond/protocols/jsonrpc.py
+++ b/trytond/protocols/jsonrpc.py
@@ -279,6 +279,8 @@
     timeout = 1

     def server_bind(self):
+        # Python < 2.6 doesn't handle self.timeout
+        self.socket.settimeout(1)
         self.socket.setsockopt(socket.SOL_SOCKET,
                 socket.SO_REUSEADDR, 1)
         SimpleJSONRPCServer.server_bind(self)
Index: trytond/protocols/webdav.py
===================================================================
--- a/trytond/protocols/webdav.py
+++ b/trytond/protocols/webdav.py
@@ -81,6 +81,8 @@
     max_children = CONFIG['max_thread']

     def server_bind(self):
+        # Python < 2.6 doesn't handle self.timeout
+        self.socket.settimeout(1)
         self.socket.setsockopt(socket.SOL_SOCKET,
                 socket.SO_REUSEADDR, 1)
         BaseHTTPServer.HTTPServer.server_bind(self)
Index: trytond/protocols/xmlrpc.py
===================================================================
--- a/trytond/protocols/xmlrpc.py
+++ b/trytond/protocols/xmlrpc.py
@@ -189,6 +189,8 @@
     timeout = 1

     def server_bind(self):
+        # Python < 2.6 doesn't handle self.timeout
+        self.socket.settimeout(1)
         self.socket.setsockopt(socket.SOL_SOCKET,
                 socket.SO_REUSEADDR, 1)
         SimpleXMLRPCServer.SimpleXMLRPCServer.server_bind(self)



-- 
Cédric Krier

B2CK SPRL
Rue de Rotterdam, 4
4000 Liège
Belgium
Tel: +32 472 54 46 59
Email/Jabber: [email protected]
Website: http://www.b2ck.com/

Attachment: pgp5h80EX6nti.pgp
Description: PGP signature

Reply via email to