Commit 145a1c49 authored by Joshua Slive's avatar Joshua Slive
Browse files

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/trunk@349747 13f79535-47bb-0310-9956-ffa450edef68
parent 5cdf43fc

docs/conf/extra/httpd-mpm.conf.in

+0 −24
Original line number Diff line number Diff line
@@ -57,30 +57,6 @@ LockFile @rel_logfiledir@/accept.lock 
    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)

docs/conf/httpd-win.conf

+1 −6
Original line number Diff line number Diff line
@@ -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

docs/conf/httpd.conf.in

+1 −8
Original line number Diff line number Diff line
@@ -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