httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-2.0/docs/conf httpd-nw.conf httpd-std.conf.in httpd-win.conf
Date Mon, 16 Sep 2002 16:57:05 GMT
wrowe       2002/09/16 09:57:04

  Modified:    docs/conf httpd-nw.conf httpd-std.conf.in httpd-win.conf
  Log:
    Consistify the configuration files for the .41 release.  This brings
    all three flavors back into sync.
  
    With luck, I won't be doing this again, but I need some time to play
    with awk magic first.  {The nested <IfModule> directives don't make
    this all that simple.}
  
  Revision  Changes    Path
  1.23      +58 -54    httpd-2.0/docs/conf/httpd-nw.conf
  
  Index: httpd-nw.conf
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/conf/httpd-nw.conf,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- httpd-nw.conf	3 Sep 2002 15:54:46 -0000	1.22
  +++ httpd-nw.conf	16 Sep 2002 16:57:04 -0000	1.23
  @@ -259,19 +259,10 @@
       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
  -
   </Directory>
   
   #
  -# 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.  Be especially careful to use
   # proper, forward slashes here.
   #
  @@ -302,11 +293,17 @@
   # DirectoryIndex: sets the file that Apache will serve if a directory
   # is requested.
   #
  -DirectoryIndex index.html
  +# 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 index.html.var
  +
   
   #
   # AccessFileName: The name of the file to look for in each directory
  -# for access control information.  See also the AllowOverride directive.
  +# for additional configuration directives.  See also the AllowOverride 
  +# directive.
   #
   AccessFileName .htaccess
   
  @@ -356,6 +353,16 @@
   HostnameLookups Off
   
   #
  +# EnableMMAP: Control whether memory-mapping is used to deliver
  +# files (assuming that the underlying OS supports it).
  +# The default is on; turn this off if you serve from NFS-mounted 
  +# filesystems.  On some systems, turning it off (regardless of
  +# filesystem) can improve performance; for details, please see
  +# http://httpd.apache.org/docs-2.0/mod/core.html#enablemmap
  +#
  +#EnableMMAP off
  +
  +#
   # ErrorLog: The location of the error log file.
   # If you do not specify an ErrorLog directive within a <VirtualHost>
   # container, error messages relating to that virtual host will be
  @@ -403,6 +410,16 @@
   #CustomLog logs/access.log combined
   
   #
  +# 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 
  @@ -482,10 +499,8 @@
   #
   
   #
  -# 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: Controls the appearance of server-generated directory
  +# listings.
   #
   IndexOptions FancyIndexing VersionSort
   
  @@ -702,46 +717,47 @@
   AddCharset shift_jis   .sjis
   
   #
  -# AddType allows you to tweak mime.types without actually editing it, or to
  -# make certain files to be certain types.
  +# AddType allows you to add to or override the MIME configuration
  +# file mime.types for specific file types.
   #
   AddType application/x-tar .tgz
   AddType image/x-icon .ico
   
   #
  -# 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:
   #
  -#<FilesMatch "\.shtml(\..+)?$">
  -#    SetOutputFilter INCLUDES
  -#</FilesMatch>
  +#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
   
   #
  -# To enable type maps, you might want to use
  +# Filters allow you to process content before it is sent to the client.
  +#
  +# To parse .shtml files for server-side includes (SSI):
  +# (You will also need to add "Includes" to the "Options" directive.)
   #
  -#AddHandler type-map var
  +#AddType text/html .shtml
  +#AddOutputFilter INCLUDES .shtml
   
   #
   # Action lets you define media types that will execute a script whenever
  @@ -752,29 +768,15 @@
   #
   
   #
  -# Customizable error response (Apache style)
  -#  these come in three flavors
  +# Customizable error responses come in three flavors:
  +# 1) plain text 2) local redirects 3) external redirects
   #
  -#    1) plain text
  +# Some examples:
   #ErrorDocument 500 "The server made a boo boo."
  -#
  -#    2) local redirects
   #ErrorDocument 404 /missing.html
  -#  to redirect to local URL /missing.html
  -#ErrorDocument 404 "/cgi-bin/missing_handlder.pl"
  -#    i.e. any string which starts with a '/' and has
  -#    no spaces.
  -#  N.B.: You can redirect to a script or a document using server-side-includes.
  -#
  -#    3) external redirects
  +#ErrorDocument 404 "/cgi-bin/missing_handler.pl"
   #ErrorDocument 402 http://www.example.com/subscription_info.html
  -#    i.e. any string whichis a valid  URL.
  -#  N.B.: Many of the environment variables associated with the original
  -#  request will *not* be available to such a script.
  -#
  -#    4) borderline case
  -#ErrorDocument 402 "http://www.example.com/info.html is the place to look"
  -#    treated as case '1' as it has spaces and thus is not a valid URL
  +#
   
   #
   # Putting this all together, we can internationalize error responses.
  @@ -843,9 +845,11 @@
   # a directory that does not include the trailing slash.  This fixes a 
   # problem with Microsoft WebFolders which does not appropriately handle 
   # redirects for folders with DAV methods.
  +# Same deal with Apple's DAV filesystem.
   #
   BrowserMatch "Microsoft Data Access Internet Publishing Provider" redirect-carefully
   BrowserMatch "^WebDrive" redirect-carefully
  +BrowserMatch "^WebDAVFS/1.[012]" redirect-carefully
   
   #
   # Allow server status reports generated by mod_status, 
  
  
  
  1.22      +4 -1      httpd-2.0/docs/conf/httpd-std.conf.in
  
  Index: httpd-std.conf.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/conf/httpd-std.conf.in,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- httpd-std.conf.in	15 Sep 2002 13:00:05 -0000	1.21
  +++ httpd-std.conf.in	16 Sep 2002 16:57:04 -0000	1.22
  @@ -452,7 +452,7 @@
   # filesystem) can improve performance; for details, please see
   # http://httpd.apache.org/docs-2.0/mod/core.html#enablemmap
   #
  -# EnableMMAP off
  +#EnableMMAP off
   
   #
   # ErrorLog: The location of the error log file.
  @@ -508,7 +508,9 @@
   # 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 
  @@ -848,6 +850,7 @@
   #
   AddHandler type-map var
   
  +#
   # Filters allow you to process content before it is sent to the client.
   #
   # To parse .shtml files for server-side includes (SSI):
  
  
  
  1.69      +25 -1     httpd-2.0/docs/conf/httpd-win.conf
  
  Index: httpd-win.conf
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/conf/httpd-win.conf,v
  retrieving revision 1.68
  retrieving revision 1.69
  diff -u -r1.68 -r1.69
  --- httpd-win.conf	15 Sep 2002 13:00:05 -0000	1.68
  +++ httpd-win.conf	16 Sep 2002 16:57:04 -0000	1.69
  @@ -321,7 +321,8 @@
   
   #
   # AccessFileName: The name of the file to look for in each directory
  -# for access control information.  See also the AllowOverride directive.
  +# for additional configuration directives.  See also the AllowOverride 
  +# directive.
   #
   AccessFileName .htaccess
   
  @@ -371,6 +372,16 @@
   HostnameLookups Off
   
   #
  +# EnableMMAP: Control whether memory-mapping is used to deliver
  +# files (assuming that the underlying OS supports it).
  +# The default is on; turn this off if you serve from NFS-mounted 
  +# filesystems.  On some systems, turning it off (regardless of
  +# filesystem) can improve performance; for details, please see
  +# http://httpd.apache.org/docs-2.0/mod/core.html#enablemmap
  +#
  +#EnableMMAP off
  +
  +#
   # ErrorLog: The location of the error log file.
   # If you do not specify an ErrorLog directive within a <VirtualHost>
   # container, error messages relating to that virtual host will be
  @@ -418,6 +429,16 @@
   #CustomLog logs/access.log combined
   
   #
  +# 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 
  @@ -748,6 +769,7 @@
   #
   AddHandler type-map var
   
  +#
   # Filters allow you to process content before it is sent to the client.
   #
   # To parse .shtml files for server-side includes (SSI):
  @@ -844,9 +866,11 @@
   # a directory that does not include the trailing slash.  This fixes a 
   # problem with Microsoft WebFolders which does not appropriately handle 
   # redirects for folders with DAV methods.
  +# Same deal with Apple's DAV filesystem.
   #
   BrowserMatch "Microsoft Data Access Internet Publishing Provider" redirect-carefully
   BrowserMatch "^WebDrive" redirect-carefully
  +BrowserMatch "^WebDAVFS/1.[012]" redirect-carefully
   
   #
   # Allow server status reports generated by mod_status,
  
  
  

Mime
View raw message