Apr 24, 2023 · Apr 22, 2023 · Apr 22, 2023 · Apr 22, 2023 · Apr 23, 2023 · Apr 23, 2023
diff --git a/Doc/library/socketserver.rst b/Doc/library/socketserver.rst
           ForkingUDPServer
           ThreadingTCPServer
           ThreadingUDPServer
           ForkingUnixStreamServer
           ForkingUnixDatagramServer
           ThreadingUnixStreamServer
           ThreadingUnixDatagramServer

   These classes are pre-defined using the mix-in classes.

 .. versionadded:: 3.12
   The ``ForkingUnixStreamServer`` and ``ForkingUnixDatagramServer`` classes
   were added.

 To implement a service, you must derive a class from :class:`BaseRequestHandler`
 and redefine its :meth:`~BaseRequestHandler.handle` method.
diff --git a/Lib/socketserver.py b/Lib/socketserver.py
    __all__.extend(["UnixStreamServer","UnixDatagramServer",
                    "ThreadingUnixStreamServer",
                    "ThreadingUnixDatagramServer"])
    if hasattr(os, "fork"):
        __all__.extend(["ForkingUnixStreamServer", "ForkingUnixDatagramServer"])

 # poll/select have the advantage of not requiring any extra file descriptor,
 # contrarily to epoll/kqueue (also, they require a single syscall).

    class ThreadingUnixDatagramServer(ThreadingMixIn, UnixDatagramServer): pass

    if hasattr(os, "fork"):
        class ForkingUnixStreamServer(ForkingMixIn, UnixStreamServer): pass

        class ForkingUnixDatagramServer(ForkingMixIn, UnixDatagramServer): pass

 class BaseRequestHandler:

    """Base class for request handler classes.
diff --git a/Lib/test/test_socketserver.py b/Lib/test/test_socketserver.py
    else:
        raise RuntimeError("timed out on %r" % (sock,))

 if HAVE_UNIX_SOCKETS and HAVE_FORKING:
    class ForkingUnixStreamServer(socketserver.ForkingMixIn,
                                  socketserver.UnixStreamServer):
        pass

    class ForkingUnixDatagramServer(socketserver.ForkingMixIn,
                                    socketserver.UnixDatagramServer):
        pass

 @test.support.requires_fork()
 @contextlib.contextmanager
    @requires_forking
    def test_ForkingUnixStreamServer(self):
        with simple_subprocess(self):
            self.run_server(ForkingUnixStreamServer,
            self.run_server(socketserver.ForkingUnixStreamServer,
                            socketserver.StreamRequestHandler,
                            self.stream_examine)

    @requires_unix_sockets
    @requires_forking
    def test_ForkingUnixDatagramServer(self):
        self.run_server(ForkingUnixDatagramServer,
        self.run_server(socketserver.ForkingUnixDatagramServer,
                        socketserver.DatagramRequestHandler,
                        self.dgram_examine)

diff --git a/Misc/ACKS b/Misc/ACKS
 Olivier Bernard
 Vivien Bernet-Rollande
 Maxwell Bernstein
 Jay Berry
 Eric Beser
 Steven Bethard
 Stephen Bevan
diff --git a/Misc/NEWS.d/next/Library/2023-04-22-02-41-06.gh-issue-103673.oE7S_k.rst b/Misc/NEWS.d/next/Library/2023-04-22-02-41-06.gh-issue-103673.oE7S_k.rst
 :mod:`socketserver` gains ``ForkingUnixStreamServer`` and
 ``ForkingUnixDatagramServer`` classes. Patch by Jay Berry.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -140,9 +140,16 @@ server is the address family.
		ForkingUDPServer
		ThreadingTCPServer
		ThreadingUDPServer
		ForkingUnixStreamServer
		ForkingUnixDatagramServer
		ThreadingUnixStreamServer
		ThreadingUnixDatagramServer

		These classes are pre-defined using the mix-in classes.

		.. versionadded:: 3.12
		The ``ForkingUnixStreamServer`` and ``ForkingUnixDatagramServer`` classes
		were added.

		To implement a service, you must derive a class from :class:`BaseRequestHandler`
		and redefine its :meth:`~BaseRequestHandler.handle` method.
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -141,6 +141,8 @@ class will essentially render the service "deaf" while one request is
		__all__.extend(["UnixStreamServer","UnixDatagramServer",
		"ThreadingUnixStreamServer",
		"ThreadingUnixDatagramServer"])
		if hasattr(os, "fork"):
		__all__.extend(["ForkingUnixStreamServer", "ForkingUnixDatagramServer"])

		# poll/select have the advantage of not requiring any extra file descriptor,
		# contrarily to epoll/kqueue (also, they require a single syscall).
Expand DownExpand Up		@@ -727,6 +729,11 @@ class ThreadingUnixStreamServer(ThreadingMixIn, UnixStreamServer): pass

		class ThreadingUnixDatagramServer(ThreadingMixIn, UnixDatagramServer): pass

		if hasattr(os, "fork"):
		class ForkingUnixStreamServer(ForkingMixIn, UnixStreamServer): pass

		class ForkingUnixDatagramServer(ForkingMixIn, UnixDatagramServer): pass

		class BaseRequestHandler:

		"""Base class for request handler classes.
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -47,14 +47,6 @@ def receive(sock, n, timeout=test.support.SHORT_TIMEOUT):
		else:
		raise RuntimeError("timed out on %r" % (sock,))

		if HAVE_UNIX_SOCKETS and HAVE_FORKING:
		class ForkingUnixStreamServer(socketserver.ForkingMixIn,
		socketserver.UnixStreamServer):
		pass

		class ForkingUnixDatagramServer(socketserver.ForkingMixIn,
		socketserver.UnixDatagramServer):
		pass

		@test.support.requires_fork()
		@contextlib.contextmanager
Expand DownExpand Up		@@ -211,7 +203,7 @@ def test_ThreadingUnixStreamServer(self):
		@requires_forking
		def test_ForkingUnixStreamServer(self):
		with simple_subprocess(self):
		self.run_server(ForkingUnixStreamServer,
		self.run_server(socketserver.ForkingUnixStreamServer,
		socketserver.StreamRequestHandler,
		self.stream_examine)

Expand DownExpand Up		@@ -247,7 +239,7 @@ def test_ThreadingUnixDatagramServer(self):
		@requires_unix_sockets
		@requires_forking
		def test_ForkingUnixDatagramServer(self):
		self.run_server(ForkingUnixDatagramServer,
		self.run_server(socketserver.ForkingUnixDatagramServer,
		socketserver.DatagramRequestHandler,
		self.dgram_examine)

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -160,6 +160,7 @@ Brice Berna
		Olivier Bernard
		Vivien Bernet-Rollande
		Maxwell Bernstein
		Jay Berry
		Eric Beser
		Steven Bethard
		Stephen Bevan
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		:mod:`socketserver` gains ``ForkingUnixStreamServer`` and
		``ForkingUnixDatagramServer`` classes. Patch by Jay Berry.