From: Anthony Baxter <anthonybaxter@gmail.com>
Date: Thu, 2 Jan 2003 03:07:48 +0000 (+0000)
Subject: Clearing out old patch queue. Patch #558547, make SocketServer more
X-Git-Tag: v2.3c1~2665
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4cedc1e84ee174cebaa59295690cfd5c6f10a0b7;p=thirdparty%2FPython%2Fcpython.git

Clearing out old patch queue. Patch #558547, make SocketServer more
robust. This makes socketserver's close() method callable repeatedly
without error - similar to other file-like objects.
---

diff --git a/Lib/SocketServer.py b/Lib/SocketServer.py
index 4437581dca13..270f4cd69d93 100644
--- a/Lib/SocketServer.py
+++ b/Lib/SocketServer.py
@@ -561,7 +561,8 @@ class StreamRequestHandler(BaseRequestHandler):
         self.wfile = self.connection.makefile('wb', self.wbufsize)
 
     def finish(self):
-        self.wfile.flush()
+        if not self.wfile.closed:
+            self.wfile.flush()
         self.wfile.close()
         self.rfile.close()