commit 5ed9d60bc53e2eb0a88f07d5afe5299acdc0b216
author Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Mon Jan 06 04:34:10 2020 -0800
committer Jason R. Coombs <jaraco@jaraco.com> Mon Jan 06 07:34:10 2020 -0500
tree 9dfbc7c226ec20c304a1ba27359c746a0ef572f5
parent 5a065ac1811f07fcea955be402b1a264fbcc43d5

bpo-38907: In http.server script, restore binding to IPv4 on Windows. (GH-17851) (#17854)

(cherry picked from commit ee94bdb0598f9bc47d6a49e58fffc97aa617be96)

Co-authored-by: Jason R. Coombs <jaraco@jaraco.com>

Co-authored-by: Jason R. Coombs <jaraco@jaraco.com>

Lib/http/server.py

diff --git a/Lib/http/server.py b/Lib/http/server.py
index b247675..0fe44bd 100644
--- a/Lib/http/server.py
+++ b/Lib/http/server.py
@@ -1280,4 +1280,16 @@
     else:
         handler_class = partial(SimpleHTTPRequestHandler,
                                 directory=args.directory)
-    test(HandlerClass=handler_class, port=args.port, bind=args.bind)
+
+    # ensure dual-stack is not disabled; ref #38907
+    class DualStackServer(ThreadingHTTPServer):
+        def server_bind(self):
+            self.socket.setsockopt(socket.IPPROTO_IPV6, socket.IPV6_V6ONLY, 0)
+            return super().server_bind()
+
+    test(
+        HandlerClass=handler_class,
+        ServerClass=DualStackServer,
+        port=args.port,
+        bind=args.bind,
+    )