Changeset 18:6fb655114e1e

Timestamp:

06/12/05 23:10:01 (3 years ago)

Author:

Allan Saddi <allan@saddi.com>

branch:

default

convert_revision:

svn:46762da8-4eb7-0310-94e9-d918b60927c8/flup/trunk@1796

Message:

Cleanly close connection socket to avoid sending a TCP RST to
the web server. (fcgi_base)

Files:

• ChangeLog (modified) (1 diff)
• flup/server/fcgi_base.py (modified) (2 diffs)

ChangeLog

@@ +1 @@
+2005-06-12  Allan Saddi  <asaddi@europa.saddi.net>
+
+        * Cleanly close connection socket to avoid sending a TCP RST to
+          the web server. (fcgi_base) Fix suggested by Dima Barsky.
+
-2005-05-31  Allan Saddi  <asaddi@ganymede.saddi.net>
-

flup/server/fcgi_base.py

@@ -620 +620 @@
-    def _cleanupSocket(self):
-        """Close the Connection's socket."""
+        try:
+            self._sock.shutdown(socket.SHUT_WR)
+        except:
+            return
+        try:
+            while True:
+                r, w, e = select.select([self._sock], [], [])
+                if not r or not self._sock.recv(1024):
+                    break
+        except:
+            pass
-        self._sock.close()
-        
@@ -702 +713 @@
-
-        if not (req.flags & FCGI_KEEP_CONN) and not self._requests:
-sock.close
+cleanupSocket
-            self._keepGoing = False
-