From 192d17c3fd9945104bc0303cf248bb0d074d260e Mon Sep 17 00:00:00 2001
From: Idan Kapustian <71190257+idankap@users.noreply.github.com>
Date: Sun, 16 Jun 2024 15:15:03 +0300
Subject: [PATCH] gh-120485: Add an override of `allow_reuse_port` on classes
 subclassing `socketserver.TCPServer` (GH-120488)

Co-authored-by: Vinay Sajip <vinay_sajip@yahoo.co.uk>
---
 Lib/http/server.py                                             | 3 ++-
 Lib/logging/config.py                                          | 3 ++-
 Lib/test/test_logging.py                                       | 1 +
 Lib/xmlrpc/server.py                                           | 1 +
 .../2024-06-14-07-52-00.gh-issue-120485.yy4K4b.rst             | 1 +
 5 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 Misc/NEWS.d/next/Core and Builtins/2024-06-14-07-52-00.gh-issue-120485.yy4K4b.rst

diff --git a/Lib/http/server.py b/Lib/http/server.py
index 7d0da5052d2..2d010649e56 100644
--- a/Lib/http/server.py
+++ b/Lib/http/server.py
@@ -129,7 +129,8 @@ DEFAULT_ERROR_CONTENT_TYPE = "text/html;charset=utf-8"
 
 class HTTPServer(socketserver.TCPServer):
 
-    allow_reuse_address = 1    # Seems to make sense in testing environment
+    allow_reuse_address = True    # Seems to make sense in testing environment
+    allow_reuse_port = True
 
     def server_bind(self):
         """Override server_bind to store the server name."""
diff --git a/Lib/logging/config.py b/Lib/logging/config.py
index 9de84e527b1..d2f23e53f35 100644
--- a/Lib/logging/config.py
+++ b/Lib/logging/config.py
@@ -984,7 +984,8 @@ def listen(port=DEFAULT_LOGGING_CONFIG_PORT, verify=None):
         A simple TCP socket-based logging config receiver.
         """
 
-        allow_reuse_address = 1
+        allow_reuse_address = True
+        allow_reuse_port = True
 
         def __init__(self, host='localhost', port=DEFAULT_LOGGING_CONFIG_PORT,
                      handler=None, ready=None, verify=None):
diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index 504862ad533..5192ce252a4 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -1038,6 +1038,7 @@ class TestTCPServer(ControlMixin, ThreadingTCPServer):
     """
 
     allow_reuse_address = True
+    allow_reuse_port = True
 
     def __init__(self, addr, handler, poll_interval=0.5,
                  bind_and_activate=True):
diff --git a/Lib/xmlrpc/server.py b/Lib/xmlrpc/server.py
index 4dddb1d10e0..90a356fbb8e 100644
--- a/Lib/xmlrpc/server.py
+++ b/Lib/xmlrpc/server.py
@@ -578,6 +578,7 @@ class SimpleXMLRPCServer(socketserver.TCPServer,
     """
 
     allow_reuse_address = True
+    allow_reuse_port = True
 
     # Warning: this is for debugging purposes only! Never set this to True in
     # production code, as will be sending out sensitive information (exception
diff --git a/Misc/NEWS.d/next/Core and Builtins/2024-06-14-07-52-00.gh-issue-120485.yy4K4b.rst b/Misc/NEWS.d/next/Core and Builtins/2024-06-14-07-52-00.gh-issue-120485.yy4K4b.rst
new file mode 100644
index 00000000000..f41c2339083
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2024-06-14-07-52-00.gh-issue-120485.yy4K4b.rst	
@@ -0,0 +1 @@
+Add an override of ``allow_reuse_port`` on classes subclassing ``socketserver.TCPServer`` where ``allow_reuse_address`` is also overridden.