Merge branch 'Add_timeout' into my-main

Author: paul-1

adafruit_httpserver.py

@@ -24,7 +24,7 @@
 except ImportError:
     pass
 
-from errno import EAGAIN, ECONNRESET
+from errno import EAGAIN, ECONNRESET, ETIMEDOUT
 import os
 
 __version__ = "0.0.0+auto.0"
@@ -381,17 +381,23 @@ def start(self, host: str, port: int = 80, root: str = "") -> None:
         self._sock.listen(10)
         self._sock.setblocking(False)  # non-blocking socket
 
-    def poll(self):
+    def poll(self, timeout=-1):
         """
         Call this method inside your main event loop to get the server to
         check for new incoming client requests. When a request comes in,
         the application callable will be invoked.
+        
+        :param int timeout: Optional timeout value in seconds.
         """
         try:
             conn, _ = self._sock.accept()
             with conn:
                 conn.setblocking(True)
+                if timeout > 0:
+                    conn.settimeout(timeout)
                 length, _ = conn.recvfrom_into(self._buffer)
+                if length <= 0:
+                    return
 
                 request = _HTTPRequest(raw_request=self._buffer[:length])
 
@@ -416,9 +422,12 @@ def poll(self):
             if ex.errno == EAGAIN:
                 # there is no data available right now, try again later.
                 return
-            if ex.errno == ECONNRESET:
+            elif ex.errno == ECONNRESET:
                 # connection reset by peer, try again later.
                 return
+            elif ex.errno == ETIMEDOUT:
+                # connection timed out
+                return
             raise
 
     @property