Commit c172b8ce authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files

  Bring win32 and the rest of the world into sync, or closer into sync.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89329 13f79535-47bb-0310-9956-ffa450edef68
parent 9ab9c8d0
Loading
Loading
Loading
Loading
+24 −10
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@
#
# This is the main Apache server configuration file.  It contains the
# configuration directives that give the server its instructions.
# See <URL:http://www.apache.org/docs/> for detailed information about
# See <URL:http://httpd.apache.org/docs/> for detailed information about
# the directives.
#
# Do NOT simply read the instructions in here without understanding
@@ -42,7 +42,7 @@
#
# NOTE!  If you intend to place this on an NFS (or otherwise network)
# mounted filesystem then please read the LockFile documentation
# (available at <URL:http://www.apache.org/docs/mod/core.html#lockfile>);
# (available at <URL:http://httpd.apache.org/docs/mod/core.html#lockfile>);
# you will save yourself a lot of trouble.
#
# Do NOT add a slash at the end of the directory path.
@@ -72,9 +72,11 @@ PidFile logs/httpd.pid
# this file will be  created when you run Apache) then you *must* ensure that
# no two invocations of Apache share the same scoreboard file.
#
<IfModule !mpm_winnt.c>
<IfModule !perchild.c>
ScoreBoardFile logs/apache_runtime_status
</IfModule>
</IfModule>

#
# Timeout: The number of seconds before receives and sends time out.
@@ -150,6 +152,14 @@ MaxThreadsPerChild 20
MaxRequestsPerChild  0
</IfModule>

# Windows MPM
# ThreadsPerChild ...... constant number of worker threads in the server process
# MaxRequestsPerChild .. maximum  number of requests a server process serves
<IfModule mpm_winnt.c>
ThreadsPerChild 250
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>
@@ -517,10 +527,12 @@ ScriptAlias /cgi-bin/ "@@ServerRoot@@/cgi-bin/"
# Directives controlling the display of server-generated directory listings.
#

#
# FancyIndexing is whether you want fancy directory indexing or standard.
# VersionSort is whether files containing version numbers should be 
# compared in the natural way, so that `apache-1.3.9.tar' is placed before
# `apache-1.3.12.tar'.
#
IndexOptions FancyIndexing VersionSort

#
@@ -623,9 +635,9 @@ AddEncoding x-gzip gz tgz
# language code is pl) may wish to use "AddLanguage pl .po" to
# avoid the ambiguity with the common suffix for perl scripts.
#
# Note 2: The example entries below illustrate that in 
# some cases the two character 'Language' abbreviation is not
# identical to the two character 'Country' code for its country,
# Note 2: The example entries below illustrate that in some cases 
# the two character 'Language' abbreviation is not identical to 
# the two character 'Country' code for its country,
# E.g. 'Danmark/dk' versus 'Danish/da'.
#
# Note 3: In the case of 'ltz' we violate the RFC by using a three char
@@ -663,6 +675,7 @@ AddLanguage ru .ru
AddLanguage tw .tw
AddLanguage zh-tw .tw

#
# LanguagePriority allows you to give precedence to some languages
# in case of a tie during content negotiation.
#
@@ -671,7 +684,7 @@ AddLanguage zh-tw .tw
#
LanguagePriority en da nl et fr de el it ja kr no pl pt pt-br ltz ca es sv tw


#
# Specify a default charset for all pages sent out. This is
# always a good idea and opens the door for future internationalisation
# of your web site, should you ever want it. Specifying it as
@@ -729,6 +742,7 @@ AddCharset EUC-JP .euc-jp
AddCharset EUC-KR      .euc-kr
AddCharset shift_jis   .sjis

#
# AddType allows you to tweak mime.types without actually editing it, or to
# make certain files to be certain types.
#
@@ -821,9 +835,9 @@ AddType application/x-tar .tgz
#ErrorDocument 402 "http://some.other_server.com/info.html is the place to look"
#    treated as case '1' as it has spaces and thus is not a valid URL
#
# The following directives modify normal HTTP response behavior.
# The first directive disables keepalive for Netscape 2.x and browsers that
# spoof it. There are known problems with these browser implementations.
# The following directives disable keepalives and HTTP header flushes.
# The first directive disables it for Netscape 2.x and browsers which
# spoof it. There are known problems with these.
# The second directive is for Microsoft Internet Explorer 4.0b2
# which has a broken HTTP/1.1 implementation and does not properly
# support keepalive when it is used on 301 or 302 (redirect) responses.
@@ -917,7 +931,7 @@ BrowserMatch "JDK/1\.0" force-response-1.0
# use only name-based virtual hosts so the server doesn't need to worry about
# IP addresses. This is indicated by the asterisks in the directives below.
#
# Please see the documentation at <URL:http://www.apache.org/docs/vhosts/>
# Please see the documentation at <URL:http://httpd.apache.org/docs/vhosts/>
# for further details before you try to setup virtual hosts.
#
# You may use the command line option '-S' to verify your virtual host
+69 −44
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ KeepAlive On
#
# MaxKeepAliveRequests: The maximum number of requests to allow
# during a persistent connection. Set to 0 to allow an unlimited amount.
# We reccomend you leave this number high, for maximum performance.
# We recommend you leave this number high, for maximum performance.
#
MaxKeepAliveRequests 100

@@ -81,31 +81,17 @@ MaxKeepAliveRequests 100
#
KeepAliveTimeout 15

#
# Apache on Win32 always creates one child process to handle requests.  If it
# dies, another child process is created automatically.  Within the child
# process multiple threads handle incoming requests.  The next two
# directives control the behaviour of the threads and processes.
#
##
## Server-Pool Size Regulation (MPM specific)
## 

#
# MaxRequestsPerChild: the number of requests each child process is
# allowed to process before the child dies.  The child will exit so
# as to avoid problems after prolonged use when Apache (and maybe the
# libraries it uses) leak memory or other resources.  On most systems, this
# isn't really needed, but a few (such as Solaris) do have notable leaks
# in the libraries.  For Win32, set this value to zero (unlimited)
# unless advised otherwise.
#
MaxRequestsPerChild 0

#
# Number of concurrent threads (i.e., requests) the server will allow.
# Set this value according to the responsiveness of the server (more
# requests active at once means they're all handled more slowly) and
# the amount of system resources you'll allow the server to consume.
#
# WinNT MPM
# ThreadsPerChild ...... constant number of worker threads in the server process
# MaxRequestsPerChild .. maximum  number of requests a server process serves
<IfModule winnt.c>
ThreadsPerChild 250
MaxRequestsPerChild  0
</IfModule>

#
# Listen: Allows you to bind Apache to specific IP addresses and/or
@@ -174,7 +160,7 @@ Port 80
# e-mailed.  This address appears on some server-generated pages, such
# as error documents.  e.g. admin@your-domain.com
#
#ServerAdmin @@ServerAdmin@@
ServerAdmin @@ServerAdmin@@

#
# ServerName allows you to set a host name which is sent back to clients for
@@ -297,7 +283,10 @@ AccessFileName .htaccess
# .htaccess files.  If you change the AccessFileName directive above,
# be sure to make the corresponding changes here.
#
<Files .htaccess>
# Also, folks tend to use names such as .htpasswd for password
# files, so this will protect those as well.
#
<Files ~ "^\.ht">
    Order allow,deny
    Deny from all
</Files>
@@ -430,6 +419,13 @@ ServerSignature On
#
Alias /icons/ "@@ServerRoot@@/icons/"

<Directory "@@ServerRoot@@/icons">
    Options Indexes MultiViews
    AllowOverride None
    Order allow,deny
    Allow from all
</Directory>

#
# ScriptAlias: This controls which directories contain server scripts.
# ScriptAliases are essentially the same as Aliases, except that
@@ -447,6 +443,8 @@ ScriptAlias /cgi-bin/ "@@ServerRoot@@/cgi-bin/"
<Directory "@@ServerRoot@@/cgi-bin">
    AllowOverride None
    Options None
    Order allow,deny
    Allow from all
</Directory>

#
@@ -461,9 +459,12 @@ ScriptAlias /cgi-bin/ "@@ServerRoot@@/cgi-bin/"
#

#
# FancyIndexing is whether you want fancy directory indexing or standard
# FancyIndexing is whether you want fancy directory indexing or standard.
# VersionSort is whether files containing version numbers should be 
# compared in the natural way, so that `apache-1.3.9.tar' is placed before
# `apache-1.3.12.tar'.
#
IndexOptions FancyIndexing
IndexOptions FancyIndexing VersionSort

#
# AddIcon* directives tell the server which icon to show for different
@@ -539,28 +540,39 @@ IndexIgnore .??* *~ *# HEADER* README* RCS CVS *,v *,t
# AddEncoding allows you to have certain browsers (Mosaic/X 2.1+) uncompress
# information on the fly. Note: Not all browsers support this.
# Despite the name similarity, the following Add* directives have nothing
# to do with the FancyIndexing customisation directives above.
# to do with the FancyIndexing customization directives above.
#
AddEncoding x-compress Z
AddEncoding x-gzip gz tgz

#
# AddLanguage allows you to specify the language of a document. You can
# then use content negotiation to give a browser a file in a language
# it can understand.
# DefaultLanguage and AddLanguage allows you to specify the language of 
# a document. You can then use content negotiation to give a browser a 
# file in a language the user can understand.
#
# Specify a default language. This means that all data
# going out without a specific language tag (see below) will 
# be marked with this one. You probably do NOT want to set
# this unless you are sure it is correct for all cases.
#
# * It is generally better to not mark a page as 
# * being a certain language than marking it with the wrong
# * language!
#
# DefaultLanguage nl
#
# Note 1: The suffix does not have to be the same as the language
# keyword --- those with documents in Polish (whose net-standard
# language code is pl) may wish to use "AddLanguage pl .po" to
# avoid the ambiguity with the common suffix for perl scripts.
#
# Note 2: The example entries below illustrate that in quite
# some cases the two character 'Language' abbreviation is not
# identical to the two character 'Country' code for its country,
# Note 2: The example entries below illustrate that in some cases 
# the two character 'Language' abbreviation is not identical to 
# the two character 'Country' code for its country,
# E.g. 'Danmark/dk' versus 'Danish/da'.
#
# Note 3: In the case of 'ltz' we violate the RFC by using a three char
# specifier. But there is 'work in progress' to fix this and get
# specifier. There is 'work in progress' to fix this and get
# the reference data for rfc1766 cleaned up.
#
# Danish (da) - Dutch (nl) - English (en) - Estonian (et)
@@ -594,14 +606,16 @@ AddLanguage ru .ru
AddLanguage tw .tw
AddLanguage zh-tw .tw

#
# LanguagePriority allows you to give precedence to some languages
# in case of a tie during content negotiation.
#
# Just list the languages in decreasing order of preference. We have
# more or less alphabetized them here. You probably want to change this.
#
LanguagePriority en da nl et fr de el it ja kr no pl pt pt-br ru ltz ca es sv tw
LanguagePriority en da nl et fr de el it ja kr no pl pt pt-br ltz ca es sv tw

#
# Specify a default charset for all pages sent out. This is
# always a good idea and opens the door for future internationalisation
# of your web site, should you ever want it. Specifying it as
@@ -663,10 +677,10 @@ AddCharset shift_jis .sjis
# AddType allows you to tweak mime.types without actually editing it, or to
# make certain files to be certain types.
#
# For example, the PHP3 module (not part of the Apache distribution)
# will typically use:
# For example, the PHP3 module (not part of the Apache distribution - see
# http://www.php.net) will typically use:
#
#AddType application/x-httpd-php3 .phtml
#AddType application/x-httpd-php3 .php3
#AddType application/x-httpd-php3-source .phps

AddType application/x-tar .tgz
@@ -686,8 +700,9 @@ AddType application/x-tar .tgz
#
# To use server-parsed HTML files
#
#AddType text/html .shtml
#AddHandler server-parsed .shtml
#<FilesMatch "\.shtml(\..+)?$">
#    SetOutputFilter INCLUDES
#</FilesMatch>

#
# Uncomment the following line to enable Apache's send-asis HTTP file
@@ -806,10 +821,17 @@ BrowserMatch "JDK/1\.0" force-response-1.0
#</Location>

#
# Proxy Server directives. Uncomment the following line to
# Proxy Server directives. Uncomment the following lines to
# enable the proxy server:
#
#<IfModule mod_proxy.c>
#ProxyRequests On
#
#<Directory proxy:*>
#    Order deny,allow
#    Deny from all
#    Allow from .your_domain.com
#</Directory>

#
# Enable/disable the handling of HTTP/1.1 "Via:" headers.
@@ -830,6 +852,9 @@ BrowserMatch "JDK/1\.0" force-response-1.0
#CacheDefaultExpire 1
#NoCache a_domain.com another_domain.edu joes.garage_sale.com

#</IfModule>
# End of proxy directives.

### Section 3: Virtual Hosts
#
# VirtualHost: If you want to maintain multiple domains/hostnames on your
@@ -837,7 +862,7 @@ BrowserMatch "JDK/1\.0" force-response-1.0
# use only name-based virtual hosts so the server doesn't need to worry about
# IP addresses. This is indicated by the asterisks in the directives below.
#
# Please see the documentation at <URL:http://www.apache.org/docs/vhosts/>
# Please see the documentation at <URL:http://httpd.apache.org/docs/vhosts/>
# for further details before you try to setup virtual hosts.
#
# You may use the command line option '-S' to verify your virtual host