Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-04 07:31:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

gh-134168: fix http.server CLI support for IPv6 and --directory when serving over HTTPS (#134169)

Browse source
This commit is contained in:
ggqlq 2025-05-24 20:19:20 +08:00 • committed by GitHub
parent 5d9c8fe3f6
commit 2fd09b0110
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Lib/http/server.py
View file

@ -980,8 +980,8 @@ def test(HandlerClass=BaseHTTPRequestHandler,
HandlerClass.protocol_version = protocol HandlerClass.protocol_version = protocol
if tls_cert: if tls_cert:
server = ThreadingHTTPSServer(addr, HandlerClass, certfile=tls_cert, server = ServerClass(addr, HandlerClass, certfile=tls_cert,
keyfile=tls_key, password=tls_password) keyfile=tls_key, password=tls_password)
else: else:
server = ServerClass(addr, HandlerClass) server = ServerClass(addr, HandlerClass)
@ -1041,7 +1041,7 @@ def _main(args=None):
parser.error(f"Failed to read TLS password file: {e}") parser.error(f"Failed to read TLS password file: {e}")
# ensure dual-stack is not disabled; ref #38907 # ensure dual-stack is not disabled; ref #38907
class DualStackServer(ThreadingHTTPServer): class DualStackServerMixin:
def server_bind(self): def server_bind(self):
# suppress exception when protocol is IPv4 # suppress exception when protocol is IPv4
@ -1054,9 +1054,16 @@ def finish_request(self, request, client_address):
self.RequestHandlerClass(request, client_address, self, self.RequestHandlerClass(request, client_address, self,
directory=args.directory) directory=args.directory)
class HTTPDualStackServer(DualStackServerMixin, ThreadingHTTPServer):
pass
class HTTPSDualStackServer(DualStackServerMixin, ThreadingHTTPSServer):
pass
ServerClass = HTTPSDualStackServer if args.tls_cert else HTTPDualStackServer
test( test(
HandlerClass=SimpleHTTPRequestHandler, HandlerClass=SimpleHTTPRequestHandler,
ServerClass=DualStackServer, ServerClass=ServerClass,
port=args.port, port=args.port,
bind=args.bind, bind=args.bind,
protocol=args.protocol, protocol=args.protocol,

2
Misc/NEWS.d/next/Library/2025-05-18-13-23-29.gh-issue-134168.hgx3Xg.rst Normal file
View file

@ -0,0 +1,2 @@
:mod:`http.server`: Fix IPv6 address binding and
:option:`--directory <http.server --directory>` handling when using HTTPS.