summaryrefslogtreecommitdiff
path: root/Lib/socketserver.py
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2016-02-18 11:01:32 +0000
committerMartin Panter <vadmium+py@gmail.com>2016-02-18 11:01:32 +0000
commita2b64e630e54027b5f49bf9f6cbdd4efb51aba4e (patch)
treedfa384ea60a4cb3884546dbeda995e8d8978b744 /Lib/socketserver.py
parentbd8112901ae442413c77c8cf2f4ae42f6905565d (diff)
parentc12fef9aa3282144dba83e0cd543bb510de6a745 (diff)
downloadcpython-git-a2b64e630e54027b5f49bf9f6cbdd4efb51aba4e.tar.gz
Issue #26309: Merge socketserver fix from 3.5
Diffstat (limited to 'Lib/socketserver.py')
-rw-r--r--Lib/socketserver.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/Lib/socketserver.py b/Lib/socketserver.py
index e16aca519e..1524d1634e 100644
--- a/Lib/socketserver.py
+++ b/Lib/socketserver.py
@@ -319,6 +319,8 @@ class BaseServer:
except:
self.handle_error(request, client_address)
self.shutdown_request(request)
+ else:
+ self.shutdown_request(request)
def handle_timeout(self):
"""Called if no new request arrives within self.timeout.