Merged NetWare into the standard conf file

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92431 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/conf/httpd-std.conf b/docs/conf/httpd-std.conf
index ffe8e78b03b181d27a92874ac4f3c07ef511fbfb..b05c0c4e69acb84bf3615a2b549b498ffd3ba430 100644 (file)
--- a/docs/conf/httpd-std.conf
+++ b/docs/conf/httpd-std.conf
@@ -53,8 +53,10 @@ ServerRoot "@@ServerRoot@@"
 # The accept serialization lock file MUST BE STORED ON A LOCAL DISK.
 #
 <IfModule !mpm_winnt.c>
+<IfModule !mpm_netware.c>
 #LockFile logs/accept.lock
 </IfModule>
+</IfModule>
 
 #
 # ScoreBoardFile: File used to store internal server process information.
@@ -63,17 +65,21 @@ ServerRoot "@@ServerRoot@@"
 # no two invocations of Apache share the same scoreboard file.
 #
 <IfModule !mpm_winnt.c>
+<IfModule !mpm_netware.c>
 <IfModule !perchild.c>
 ScoreBoardFile logs/apache_runtime_status
 </IfModule>
 </IfModule>
+</IfModule>
 
 
 #
 # PidFile: The file in which the server should record its process
 # identification number when it starts.
 #
+<IfModule !mpm_netware.c>
 PidFile logs/httpd.pid
+</IfModule>
 
 #
 # Timeout: The number of seconds before receives and sends time out.
@@ -168,6 +174,25 @@ MaxClients                 50
 RequestsPerThread       10000
 </IfModule>    
 
+# NetWare MPM
+# ThreadStackSize ...... Stack size allocated for each worker thread
+# StartThreads ......... Number of worker threads launched at server startup
+# MinSpareThreads ...... Minimum number of idle threads, to handle request spikes
+# MaxSpareThreads ...... Maximum number of idle threads
+# MaxThreads ........... Maximum number of worker threads alive at the same time
+# MaxRequestsPerChild .. Maximum  number of requests a thread serves. It is 
+#                         recommended that the default value of 0 be set for this
+#                         directive on NetWare.  This will allow the thread to 
+#                         continue to service requests indefinitely.                          
+<IfModule mpm_netware.c>
+ThreadStackSize      65536
+StartThreads           250
+MinSpareThreads         25
+MaxSpareThreads        250
+MaxThreads            1000
+MaxRequestsPerChild      0
+</IfModule>
+
 #
 # Listen: Allows you to bind Apache to specific IP addresses and/or
 # ports, in addition to the default. See also the <VirtualHost>
@@ -212,6 +237,7 @@ Listen @@Port@@
 #
 
 <IfModule !mpm_winnt.c>
+<IfModule !mpm_netware.c>
 #
 # If you wish httpd to run as a different user or group, you must run
 # httpd as root initially and it will switch.  
@@ -227,6 +253,7 @@ Listen @@Port@@
 User nobody
 Group #-1
 </IfModule>
+</IfModule>
 
 #
 # ServerAdmin: Your address, where problems with the server should be