Commit ee448dc8 authored by Sander Striker's avatar Sander Striker
Browse files

* docs/conf/httpd-win.conf

  Reformat.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@160584 13f79535-47bb-0310-9956-ffa450edef68
parent 43f47985
Loading
Loading
Loading
Loading
+476 −450
Original line number Diff line number Diff line
@@ -299,7 +299,9 @@ DocumentRoot "@@ServerRoot@@/htdocs"
# is a more appropriate choice.  Note that you must also set the default
# access control for these directories, as in the example below.
#
<IfModule userdir_module>
    UserDir "My Documents/My Website"
</IfModule>

#
# Control access to UserDir directories.  The following is an example
@@ -310,7 +312,7 @@ UserDir "My Documents/My Website"
# or whichever, as appropriate.
#
#<Directory "C:/Documents and Settings/*/My Documents/My Website">
#    AllowOverride FileInfo AuthConfig Limit
#    AllowOverride FileInfo AuthConfig Limit Indexes
#    Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
#    <Limit GET POST OPTIONS PROPFIND>
#        Order allow,deny
@@ -330,7 +332,9 @@ UserDir "My Documents/My Website"
# negotiated documents.  The MultiViews Option can be used for the 
# same purpose, but it is much slower.
#
<IfModule dir_module>
    DirectoryIndex index.html index.html.var
</IfModule>

#
# AccessFileName: The name of the file to look for in each directory
@@ -348,12 +352,15 @@ AccessFileName .htaccess
    Deny from all
</Files>

<IfModule mime_module>
    #
    # TypesConfig describes where the mime.types file (or equivalent) is
    # to be found.
    #
    TypesConfig conf/mime.types

</IfModule>

#
# DefaultType is the default MIME type the server will use for a document
# if it cannot otherwise determine one, such as from filename extensions.
@@ -419,6 +426,7 @@ ErrorLog logs/error.log
#
LogLevel warn

<IfModule log_config_module>
    #
    # The following directives define some format nicknames for use with
    # a CustomLog directive (see below).
@@ -428,8 +436,10 @@ LogFormat "%h %l %u %t \"%r\" %>s %b" common
    LogFormat "%{Referer}i -> %U" referer
    LogFormat "%{User-agent}i" agent

    <IfModule logio_module>
      # You need to enable mod_logio.c to use %I and %O
#LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio
      LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio
    </IfModule>

    #
    # The location and format of the access logfile (Common Logfile Format).
@@ -452,6 +462,7 @@ CustomLog logs/access.log common
    # (Combined Logfile Format) you can use the following directive.
    #
    #CustomLog logs/access.log combined
</IfModule>

#
# ServerTokens
@@ -473,6 +484,7 @@ ServerTokens Full
#
ServerSignature On

<IfModule alias_module>
    # 
    # Apache parses all CGI scripts for the shebang line by default.
    # This comment line, the first line of the script, consists of the symbols
@@ -521,8 +533,8 @@ ServerSignature On
    # realname must also be slash terminated, and if the fakename omits the 
    # trailing slash, the realname must also omit it.
    #
# We include the /icons/ alias for FancyIndexed directory listings.  If you
# do not use FancyIndexing, you may comment this out.
    # We include the /icons/ alias for FancyIndexed directory listings.  If
    # you do not use FancyIndexing, you may comment this out.
    #
    Alias /icons/ "@@ServerRoot@@/icons/"

@@ -535,8 +547,8 @@ Alias /icons/ "@@ServerRoot@@/icons/"

    #
    # This should be changed to the ServerRoot/manual/.  The alias provides
# the manual, even if you choose to move your DocumentRoot.  You may comment
# this out if you do not care for the documentation.
    # the manual, even if you choose to move your DocumentRoot.  You may
    # comment this out if you do not care for the documentation.
    #
    AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br|ru))?(/.*)?$ \
        "@@ServerRoot@@/manual$1"
@@ -559,12 +571,14 @@ AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br|ru))?(/.*)?$ \
    # ScriptAlias: This controls which directories contain server scripts. 
    # ScriptAliases are essentially the same as Aliases, except that
    # documents in the realname directory are treated as applications and
# run by the server when requested rather than as documents sent to the client.
# The same rules about trailing "/" apply to ScriptAlias directives as to
# Alias.
    # run by the server when requested rather than as documents sent to the
    # client.  The same rules about trailing "/" apply to ScriptAlias
    # directives as to Alias.
    #
    ScriptAlias /cgi-bin/ "@@ServerRoot@@/cgi-bin/"

</IfModule>

#
# "@@ServerRoot@@/cgi-bin" should be changed to whatever your ScriptAliased
# CGI directory exists, if you have that configured.
@@ -586,6 +600,7 @@ ScriptAlias /cgi-bin/ "@@ServerRoot@@/cgi-bin/"
#
# Directives controlling the display of server-generated directory listings.
#
<IfModule autoindex_module>

    #
    # IndexOptions: Controls the appearance of server-generated directory
@@ -657,7 +672,9 @@ HeaderName HEADER.html
    # and not include in the listing.  Shell-style wildcarding is permitted.
    #
    IndexIgnore .??* *~ *# HEADER* README* RCS CVS *,v *,t
</IfModule>

<IfModule mime_module>
    #
    # AddType allows you to add to or override the MIME configuration
    # file mime.types for specific file types.
@@ -742,7 +759,9 @@ AddLanguage ru .ru
    AddLanguage sv .sv
    AddLanguage zh-CN .zh-cn
    AddLanguage zh-TW .zh-tw
</IfModule>

<IfModule negotiation_module>
    #
    # LanguagePriority allows you to give precedence to some languages
    # in case of a tie during content negotiation.
@@ -759,6 +778,9 @@ LanguagePriority en ca cs da de el eo es et fr he hr it ja ko ltz nl nn no pl pt
    #
    ForceLanguagePriority Prefer Fallback

</IfModule>

<IfModule mime_module>
    #
    # Commonly used filename extensions to character sets. You probably
    # want to avoid clashes with the language extensions, unless you
@@ -840,6 +862,7 @@ AddHandler type-map var
    #
    #AddType text/html .shtml
    #AddOutputFilter INCLUDES .shtml
</IfModule>

#
# Action lets you define media types that will execute a script whenever
@@ -912,8 +935,7 @@ AddHandler type-map var
#    ErrorDocument 503 /error/HTTP_SERVICE_UNAVAILABLE.html.var
#    ErrorDocument 506 /error/HTTP_VARIANT_ALSO_VARIES.html.var



<IfModule setenvif_module>
    #
    # The following directives modify normal HTTP response behavior to
    # handle known problems with browser implementations.
@@ -936,7 +958,9 @@ BrowserMatch "^WebDrive" redirect-carefully
    BrowserMatch "^WebDAVFS/1.[012]" redirect-carefully
    BrowserMatch "^gnome-vfs/1.0" redirect-carefully
    BrowserMatch "^XML Spy" redirect-carefully
</IfModule>

<IfModule status_module>
    #
    # Allow server status reports generated by mod_status,
    # with the URL of http://servername/server-status
@@ -948,7 +972,9 @@ BrowserMatch "^XML Spy" redirect-carefully
    #    Deny from all
    #    Allow from .@@DomainName@@
    #</Location>
</IfModule>

<IfModule info_module>
    #
    # Allow remote server configuration reports, with the URL of
    #  http://servername/server-info (requires that mod_info.c be loaded).
@@ -960,7 +986,7 @@ BrowserMatch "^XML Spy" redirect-carefully
    #    Deny from all
    #    Allow from .@@DomainName@@
    #</Location>

</IfModule>

#
# Bring in additional module-specific configurations