Commit 6f7277ec authored by Justin Erenkrantz's avatar Justin Erenkrantz
Browse files

Continue making httpd.conf even smaller. 

* httpd.conf.in: Remove PidFile; move a bunch of configuration options that
  are backed by equivalent run-time defaults to...
* extra/httpd-default.conf.in (added): ...here.
* extra/httpd-mpm.conf.in: Move PidFile example here.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/simple-conf@160063 13f79535-47bb-0310-9956-ffa450edef68
parent 8d3145ab

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

0 → 100644
+56 −0
Original line number Diff line number Diff line 
#

# This configuration file reflects default settings for Apache HTTP Server.

#

# You may change these, but chances are that you may not need to.

#



#

# Timeout: The number of seconds before receives and sends time out.

#

Timeout 300



#

# KeepAlive: Whether or not to allow persistent connections (more than

# one request per connection). Set to "Off" to deactivate.

#

KeepAlive On



#

# MaxKeepAliveRequests: The maximum number of requests to allow

# during a persistent connection. Set to 0 to allow an unlimited amount.

# We recommend you leave this number high, for maximum performance.

#

MaxKeepAliveRequests 100



#

# KeepAliveTimeout: Number of seconds to wait for the next request from the

# same client on the same connection.

#

KeepAliveTimeout 15



#

# AccessFileName: The name of the file to look for in each directory

# for additional configuration directives.  See also the AllowOverride 

# directive.

#

AccessFileName .htaccess



#

# ServerTokens

# This directive configures what you return as the Server HTTP response

# Header. The default is 'Full' which sends information about the OS-Type

# and compiled in modules.

# Set to one of:  Full | OS | Minor | Minimal | Major | Prod

# where Full conveys the most information, and Prod the least.

#

ServerTokens Full



#

# Optionally add a line containing the server version and virtual host

# name to server-generated pages (internal error documents, FTP directory 

# listings, mod_status and mod_info output etc., but not CGI generated 

# documents or custom error documents).

# Set to "EMail" to also include a mailto: link to the ServerAdmin.

# Set to one of:  On | Off | EMail

#

ServerSignature On

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

+9 −0
Original line number Diff line number Diff line
@@ -5,6 +5,15 @@ 
# installed httpd.  Use "apachectl -l" to find out the

# active mpm.



#

# PidFile: The file in which the server should record its process

# identification number when it starts.

#

# Note that this is the default PidFile for most MPMs.

#

<IfModule !mpm_netware_module>

    PidFile @rel_runtimedir@/httpd.pid

</IfModule>



# prefork MPM

# StartServers: number of server processes to start

docs/conf/httpd.conf.in

+1 −61
Original line number Diff line number Diff line
@@ -45,39 +45,6 @@ ServerRoot "@@ServerRoot@@" 
#LockFile @rel_logfiledir@/accept.lock

#ScoreBoardFile @rel_logfiledir@/apache_runtime_status



#

# PidFile: The file in which the server should record its process

# identification number when it starts.

#

<IfModule !mpm_netware_module>

    PidFile @rel_runtimedir@/httpd.pid

</IfModule>



#

# Timeout: The number of seconds before receives and sends time out.

#

Timeout 300



#

# KeepAlive: Whether or not to allow persistent connections (more than

# one request per connection). Set to "Off" to deactivate.

#

KeepAlive On



#

# MaxKeepAliveRequests: The maximum number of requests to allow

# during a persistent connection. Set to 0 to allow an unlimited amount.

# We recommend you leave this number high, for maximum performance.

#

MaxKeepAliveRequests 100



#

# KeepAliveTimeout: Number of seconds to wait for the next request from the

# same client on the same connection.

#

KeepAliveTimeout 15





#

# Listen: Allows you to bind Apache to specific IP addresses and/or

# ports, instead of the default. See also the <VirtualHost>
@@ -232,13 +199,6 @@ DocumentRoot "@exp_htdocsdir@" 
    DirectoryIndex index.html

</IfModule>



#

# AccessFileName: The name of the file to look for in each directory

# for additional configuration directives.  See also the AllowOverride 

# directive.

#

AccessFileName .htaccess



#

# The following lines prevent .htaccess and .htpasswd files from being 

# viewed by Web clients.
@@ -350,26 +310,6 @@ LogLevel warn 
    #CustomLog @rel_logfiledir@/access_log combined

</IfModule>



#

# ServerTokens

# This directive configures what you return as the Server HTTP response

# Header. The default is 'Full' which sends information about the OS-Type

# and compiled in modules.

# Set to one of:  Full | OS | Minor | Minimal | Major | Prod

# where Full conveys the most information, and Prod the least.

#

ServerTokens Full



#

# Optionally add a line containing the server version and virtual host

# name to server-generated pages (internal error documents, FTP directory 

# listings, mod_status and mod_info output etc., but not CGI generated 

# documents or custom error documents).

# Set to "EMail" to also include a mailto: link to the ServerAdmin.

# Set to one of:  On | Off | EMail

#

ServerSignature On



<IfModule alias_module>

    #

    # Aliases: Add here as many aliases as you need (with no limit). The format is