You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by sl...@apache.org on 2005/11/29 17:08:04 UTC
svn commit: r349747 - in /httpd/httpd/trunk/docs/conf:
extra/httpd-mpm.conf.in httpd-win.conf httpd.conf.in
Author: slive
Date: Tue Nov 29 08:08:01 2005
New Revision: 349747
URL: http://svn.apache.org/viewcvs?rev=349747&view=rev
Log:
Some config file changes:
- Make the <Files> section safer by
adding Satisfy all (as is already present in 1.3)
- Remove some handler examples that almost nobody will
use (the config file is not the documentation)
- Remove some win32 specific stuff from the default
config, since win32 uses its own config file
- Remove the config section for the perchild mpm
Modified:
httpd/httpd/trunk/docs/conf/extra/httpd-mpm.conf.in
httpd/httpd/trunk/docs/conf/httpd-win.conf
httpd/httpd/trunk/docs/conf/httpd.conf.in
Modified: httpd/httpd/trunk/docs/conf/extra/httpd-mpm.conf.in
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/conf/extra/httpd-mpm.conf.in?rev=349747&r1=349746&r2=349747&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/conf/extra/httpd-mpm.conf.in (original)
+++ httpd/httpd/trunk/docs/conf/extra/httpd-mpm.conf.in Tue Nov 29 08:08:01 2005
@@ -57,30 +57,6 @@
MaxRequestsPerChild 0
</IfModule>
-# perchild MPM
-# NumServers: constant number of server processes
-# StartThreads: initial number of worker threads in each server process
-# MinSpareThreads: minimum number of worker threads which are kept spare
-# MaxSpareThreads: maximum number of worker threads which are kept spare
-# MaxThreadsPerChild: maximum number of worker threads in each server process
-# MaxRequestsPerChild: maximum number of connections per server process
-<IfModule mpm_perchild_module>
- NumServers 5
- StartThreads 5
- MinSpareThreads 5
- MaxSpareThreads 10
- MaxThreadsPerChild 20
- MaxRequestsPerChild 0
-</IfModule>
-
-# WinNT MPM
-# ThreadsPerChild: constant number of worker threads in the server process
-# MaxRequestsPerChild: maximum number of requests a server process serves
-<IfModule mpm_winnt_module>
- ThreadsPerChild 250
- MaxRequestsPerChild 0
-</IfModule>
-
# BeOS MPM
# StartThreads: how many threads do we initially spawn?
# MaxClients: max number of threads we can have (1 thread == 1 client)
Modified: httpd/httpd/trunk/docs/conf/httpd-win.conf
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/conf/httpd-win.conf?rev=349747&r1=349746&r2=349747&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/conf/httpd-win.conf (original)
+++ httpd/httpd/trunk/docs/conf/httpd-win.conf Tue Nov 29 08:08:01 2005
@@ -161,6 +161,7 @@
AllowOverride None
Order deny,allow
Deny from all
+ Satisfy all
</Directory>
#
@@ -390,12 +391,6 @@
# (You will also need to add "ExecCGI" to the "Options" directive.)
#
#AddHandler cgi-script .cgi
-
- # For files that include their own HTTP headers:
- #AddHandler send-as-is asis
-
- # For server-parsed imagemap files:
- #AddHandler imap-file map
# For type maps (negotiated resources):
#AddHandler type-map var
Modified: httpd/httpd/trunk/docs/conf/httpd.conf.in
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/conf/httpd.conf.in?rev=349747&r1=349746&r2=349747&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/conf/httpd.conf.in (original)
+++ httpd/httpd/trunk/docs/conf/httpd.conf.in Tue Nov 29 08:08:01 2005
@@ -53,7 +53,6 @@
#
@@LoadModule@@
-<IfModule !mpm_winnt_module>
<IfModule !mpm_netware_module>
#
# If you wish httpd to run as a different user or group, you must run
@@ -66,7 +65,6 @@
User daemon
Group daemon
</IfModule>
-</IfModule>
# 'Main' server configuration
#
@@ -173,6 +171,7 @@
<FilesMatch "^\.ht">
Order allow,deny
Deny from all
+ Satisfy All
</FilesMatch>
#
@@ -315,12 +314,6 @@
# (You will also need to add "ExecCGI" to the "Options" directive.)
#
#AddHandler cgi-script .cgi
-
- # For files that include their own HTTP headers:
- #AddHandler send-as-is asis
-
- # For server-parsed imagemap files:
- #AddHandler imap-file map
# For type maps (negotiated resources):
#AddHandler type-map var