Cleanly close connection socket to avoid sending a TCP RST to

the web server. (fcgi_base)

2 files changed, 17 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index cc558f3..4f6c2b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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>
 
 	* Take scriptName from the WSGI_SCRIPT_NAME environment variable
diff --git a/flup/server/fcgi_base.py b/flup/server/fcgi_base.py
index 69ed2a0..c09ab5c 100644
--- a/flup/server/fcgi_base.py
+++ b/flup/server/fcgi_base.py
@@ -619,6 +619,17 @@ class Connection(object):
 
     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()
         
     def run(self):
@@ -701,7 +712,7 @@ class Connection(object):
         if __debug__: _debug(2, 'end_request: flags = %d' % req.flags)
 
         if not (req.flags & FCGI_KEEP_CONN) and not self._requests:
-            self._sock.close()
+            self._cleanupSocket()
             self._keepGoing = False
 
     def _do_get_values(self, inrec):