Merge r349747 from trunk:

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

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@349748 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/conf/extra/httpd-mpm.conf.in b/docs/conf/extra/httpd-mpm.conf.in
index 54b4906a89c0764e819d0bd4534fa68808e3be0d..36b2cf2d6fe6f31a14cb76fb4592328aaf3b826b 100644 (file)
--- a/docs/conf/extra/httpd-mpm.conf.in
+++ b/docs/conf/extra/httpd-mpm.conf.in
@@ -57,14 +57,6 @@ LockFile @rel_logfiledir@/accept.lock
     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)

diff --git a/docs/conf/httpd-win.conf b/docs/conf/httpd-win.conf
index 4eeccb932b3c0fecffdf599620c2170fbaf4463b..13b826c4ef47c3783822cad610230683218e8a11 100644 (file)
--- a/docs/conf/httpd-win.conf
+++ b/docs/conf/httpd-win.conf
@@ -161,6 +161,7 @@ DocumentRoot "@@ServerRoot@@/htdocs"
     AllowOverride None
     Order deny,allow
     Deny from all
+    Satisfy all
 </Directory>
 
 #
@@ -391,12 +392,6 @@ DefaultType text/plain
     #
     #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
 

diff --git a/docs/conf/httpd.conf.in b/docs/conf/httpd.conf.in
index a163c70a9b618f382283ddcc6aacddfa4e40b35f..a87d09e4060c5dbf802c8a5b912232e24b4b9a19 100644 (file)
--- a/docs/conf/httpd.conf.in
+++ b/docs/conf/httpd.conf.in
@@ -53,7 +53,6 @@ Listen @@Port@@
 #
 @@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 @@ Listen @@Port@@
 User daemon
 Group daemon
 </IfModule>
-</IfModule>
 
 # 'Main' server configuration
 #
@@ -173,6 +171,7 @@ DocumentRoot "@exp_htdocsdir@"
 <FilesMatch "^\.ht">
     Order allow,deny
     Deny from all
+    Satisfy All
 </FilesMatch>
 
 #
@@ -316,12 +315,6 @@ DefaultType text/plain
     #
     #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