Handle timeout exception in roundup-server better.

rouilj · rouilj · commit 8c2fe02110cd · 2025-01-12T12:59:41.000-05:00
A timeout in roundup-server used to generate another exception:

   OSError: cannot read from timed out object

when it tried to reuse the socket that timed out.

Now return status 408, a brief message and trigger closing of the
socket.

Manual testing, no CI.

To test used curl -X POST with no --data defined.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -71,6 +71,9 @@ Fixed:
   uninitialized list element on a (Mini)FieldStorage when unexpected
   input is posted via wsgi. (Reported and debugged by Christof
   Meerwald; fix John Rouillard)
+- close http socket and send a 408 status when a timeout exception
+  is handed in roundup-server. This prevents another exception
+  caused by using a timed out socket. (John Rouillard)
 
 Features:
 
diff --git a/roundup/scripts/roundup_server.py b/roundup/scripts/roundup_server.py
@@ -282,6 +282,15 @@ def run_cgi(self):
             exc, val, tb = sys.exc_info()
             if hasattr(socket, 'timeout') and isinstance(val, socket.timeout):
                 self.log_error('timeout')
+                self.send_response(408)
+                self.send_header('Content-Type', 'text/html')
+
+                output = s2b('''<body><p>Connection timed out</p></body>''')
+                # Close connection
+                self.send_header('Content-Length', len(output))
+                self.end_headers()
+                self.wfile.write(output)
+                self.close_connection = True
             else:
                 self.send_response(400)
                 self.send_header('Content-Type', 'text/html')
