From: Christophe Jaillet Date: Sat, 11 Jul 2015 04:57:56 +0000 (+0000) Subject: Backport r1690122. X-Git-Tag: 2.4.17~227 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54367ef61540ee5f563df1bae745792c8f005321;p=thirdparty%2Fapache%2Fhttpd.git Backport r1690122. Doc and comment fix only git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1690347 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/mod/mpmt_os2.xml b/docs/manual/mod/mpmt_os2.xml index c5fd0f17464..8a54c881e3b 100644 --- a/docs/manual/mod/mpmt_os2.xml +++ b/docs/manual/mod/mpmt_os2.xml @@ -37,7 +37,7 @@ StartServers processes accepting connections.

-

Each child process consists of a a pool of worker threads and a +

Each child process consists of a pool of worker threads and a main thread that accepts connections and passes them to the workers via a work queue. The worker thread pool is dynamic, managed by a maintenance thread so that the number of idle threads is kept between diff --git a/server/mpm/mpmt_os2/mpmt_os2.c b/server/mpm/mpmt_os2/mpmt_os2.c index 3bd360d0fff..c1e122d7656 100644 --- a/server/mpm/mpmt_os2/mpmt_os2.c +++ b/server/mpm/mpmt_os2/mpmt_os2.c @@ -24,7 +24,7 @@ * spawning children as required to ensure there are always ap_daemons_to_start * processes accepting connections. * - * Each child process consists of a a pool of worker threads and a + * Each child process consists of a pool of worker threads and a * main thread that accepts connections & passes them to the workers via * a work queue. The worker thread pool is dynamic, managed by a maintanence * thread so that the number of idle threads is kept between