From c12fef9aa3282144dba83e0cd543bb510de6a745 Mon Sep 17 00:00:00 2001 From: Martin Panter Date: Thu, 18 Feb 2016 10:43:55 +0000 Subject: Issue #26309: Shut down socketserver request if verify_request() is false Patch by Aviv Palivoda. --- Lib/socketserver.py | 2 ++ Lib/test/test_socketserver.py | 24 ++++++++++++++++++++++++ Misc/NEWS | 4 ++++ 3 files changed, 30 insertions(+) diff --git a/Lib/socketserver.py b/Lib/socketserver.py index e16aca5..1524d16 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. diff --git a/Lib/test/test_socketserver.py b/Lib/test/test_socketserver.py index 1ea66a6..f8f7762 100644 --- a/Lib/test/test_socketserver.py +++ b/Lib/test/test_socketserver.py @@ -280,6 +280,30 @@ class SocketServerTest(unittest.TestCase): socketserver.TCPServer((HOST, -1), socketserver.StreamRequestHandler) + def test_shutdown_request_called_if_verify_request_false(self): + # Issue #26309: BaseServer should call shutdown_request even if + # verify_request is False + shutdown_called = False + + class MyServer(socketserver.TCPServer): + def verify_request(self, request, client_address): + return False + + def shutdown_request(self, request): + nonlocal shutdown_called + shutdown_called = True + super().shutdown_request(request) + + def connect_to_server(proto, addr): + s = socket.socket(proto, socket.SOCK_STREAM) + s.connect(addr) + s.close() + + self.run_server(MyServer, + socketserver.StreamRequestHandler, + connect_to_server) + self.assertEqual(shutdown_called, True) + class MiscTestCase(unittest.TestCase): diff --git a/Misc/NEWS b/Misc/NEWS index 20be117..2442290 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -76,6 +76,10 @@ Core and Builtins Library ------- +- Issue #26309: In the "socketserver" module, shut down the request (closing + the connected socket) when verify_request() returns false. Patch by Aviv + Palivoda. + - Issue #25939: On Windows open the cert store readonly in ssl.enum_certificates. - Issue #25995: os.walk() no longer uses FDs proportional to the tree depth. -- cgit v0.12 nput type='hidden' name='h' value='v4.8.5'/>
path: root/tests/auto/qabstractprintdialog
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-11-24 14:15:16 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-11-24 14:15:16 (GMT)
commitbdeb4b458320ddefc9bcd19620bed7dc242b4d5c (patch)
tree51b995db1f4fec658adf9f644ce7590501d627ad /tests/auto/qabstractprintdialog
parentcaca740ea1219227008c303b5f2fac24af5a62a0 (diff)
parentfe8276e812c5fdc690715d7e36a6b6d70cba7d33 (diff)
downloadQt-bdeb4b458320ddefc9bcd19620bed7dc242b4d5c.zip
Qt-bdeb4b458320ddefc9bcd19620bed7dc242b4d5c.tar.gz
Qt-bdeb4b458320ddefc9bcd19620bed7dc242b4d5c.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Prevent compilers optimizing eval timebomb code out of existence.
Diffstat (limited to 'tests/auto/qabstractprintdialog')