From: Joshua Slive Date: Wed, 5 Dec 2001 18:28:37 +0000 (+0000) Subject: Config file updates. Mostly just playing with comments, but a few functional X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ce1a7097eed79c008c2915db3803f23468ae9acd;p=apache Config file updates. Mostly just playing with comments, but a few functional changes: 1. Remove the directives in the document root section that are there to handle the index.html.var and put them in their normal place in the config file. I see no reason to duplicate the directives and explanations. 2. Change from the funky FilesMatch/SetOutputFilter to AddOutputFilter for the SSI configuration. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92346 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/conf/httpd-std.conf b/docs/conf/httpd-std.conf index 698a197ada..ba48606508 100644 --- a/docs/conf/httpd-std.conf +++ b/docs/conf/httpd-std.conf @@ -236,16 +236,14 @@ Group #-1 ServerAdmin you@your.address # -# ServerName allows you to set a host name which is sent back to clients for -# your server if it's different than the one the program would get (i.e., use -# "www" instead of the host's real name). +# ServerName gives the name and port that the server uses to identify itself. +# This can often be determined automatically, but we recommend you specify +# it explictly to prevent problems during startup. +# +# If this is not set to valid DNS name for your host, server-generated +# redirections will not work. See also the UseCanonicalName directive. # -# Note: You cannot just invent host names and hope they work. The name you -# define here must be a valid DNS name for your host. If you don't understand -# this, ask your network administrator. # If your host doesn't have a registered DNS name, enter its IP address here. -# You will have to access it by its address (e.g., http://123.45.67.89/) -# anyway, and this will make redirections work in a sensible way. # #ServerName new.host.name:80 @@ -257,7 +255,7 @@ ServerAdmin you@your.address DocumentRoot "@@ServerRoot@@/htdocs" # -# Each directory to which Apache has access, can be configured with respect +# Each directory to which Apache has access can be configured with respect # to which services and features are allowed and/or disabled in that # directory (and its subdirectories). # @@ -282,18 +280,23 @@ DocumentRoot "@@ServerRoot@@/htdocs" # -# This may also be "None", "All", or any combination of "Indexes", -# "Includes", "FollowSymLinks", "ExecCGI", or "MultiViews". +# Possible values for the Options directive are "None", "All", +# or any combination of: +# Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI Multiviews # # Note that "MultiViews" must be named *explicitly* --- "Options All" # doesn't give it to you. +# +# The Options directive is both complicated and important. Please see +# http://httpd.apache.org/docs-2.0/mod/core.html#options +# for more information. # Options Indexes FollowSymLinks # -# This controls which options the .htaccess files in directories can -# override. Can also be "All", or any combination of "Options", "FileInfo", -# "AuthConfig", and "Limit" +# AllowOverride controls what directives may be placed in .htaccess files. +# It can be "All", "None", or any combination of: +# Options FileInfo AuthConfig Limit # AllowOverride None @@ -303,19 +306,10 @@ DocumentRoot "@@ServerRoot@@/htdocs" Order allow,deny Allow from all -# -# Note that directly accessing an index.html.var typemap is much faster -# than using MultiViews negotation on a directory. We distribute a typemap -# of the complete index.html collection, so we use that index.html.var -# typemap here. If Options is set to Multiviews, this optimization is lost. -# - AddHandler type-map var - DirectoryIndex index.html index.html.var - # -# UserDir: The name of the directory which is appended onto a user's home +# UserDir: The name of the directory that is appended onto a user's home # directory if a ~user request is received. # UserDir public_html @@ -338,14 +332,18 @@ UserDir public_html # # -# DirectoryIndex: Name of the file or files to use as a pre-written HTML -# directory index. Separate multiple entries with spaces. +# DirectoryIndex: sets the file that Apache will serve if a directory +# is requested. +# +# The index.html.var file (a type-map) is used to deliver content- +# negotiated documents. The MultiViews Option can be used for the +# same purpose, but it is much slower. # -DirectoryIndex index.html +DirectoryIndex index.html index.html.var # # AccessFileName: The name of the file to look for in each directory -# for access control information. +# for access control information. See also the AllowOverride directive. # AccessFileName .htaccess @@ -749,51 +747,44 @@ 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. -# -# For example, the PHP3 module (not part of the Apache distribution - see -# http://www.php.net) will typically use: -# -#AddType application/x-httpd-php3 .php3 -#AddType application/x-httpd-php3-source .phps +# AddType allows you to add to or override the MIME configuration +# file mime.types for specific file types. AddType application/x-tar .tgz # -# AddHandler allows you to map certain file extensions to "handlers", +# AddHandler allows you to map certain file extensions to "handlers": # actions unrelated to filetype. These can be either built into the server -# or added with the Action command (see below) -# -# If you want to use server side includes, or CGI outside -# ScriptAliased directories, uncomment the following lines. +# or added with the Action directive (see below) # -# To use CGI scripts: +# To use CGI scripts outside of ScriptAliased directories: +# (You will also need to add "ExecCGI" to the "Options" directive.) # #AddHandler cgi-script .cgi # -# To use server-parsed HTML files +# For files that include their own HTTP headers: # -# -# SetOutputFilter INCLUDES -# +#AddHandler send-as-is asis # -# Uncomment the following line to enable Apache's send-asis HTTP file -# feature +# For server-parsed imagemap files: # -#AddHandler send-as-is asis +#AddHandler imap-file map # -# If you wish to use server-parsed imagemap files, use +# For type maps (negotiated resources): +# (This is enabled by default to allow the Apache "It Worked" page +# to be distributed in multiple languages.) # -#AddHandler imap-file map +AddHandler type-map var +# Filters allow you to process content before it is sent to the client. # -# To enable type maps, you might want to use +# To parse .shtml files for server-side includes (SSI): +# (You will also need to add "Includes" to the "Options" directive.) # -#AddHandler type-map var +#AddOutputFilter INCLUDES .shtml # # Action lets you define media types that will execute a script whenever