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-win.conf httpd-std.conf
Date Thu, 10 Jan 2002 21:35:05 GMT
wrowe       02/01/10 13:35:05

  Modified:    docs/conf httpd-win.conf httpd-std.conf
  Log:
    Once again, try to bring the world into sync.  Someday soon, we need to
    generate this and Netware's from -std using awk.  It really would make
    more sense to strip out the appropriate directives as we build, instead
    of 'toggling' the mpm with <IfModule > (at least, as an option during
    build.)  But that requires an un-nested syntax such as
    <IfModule module module> or <IfNotModule module module> that would be
    simpler to parse in awk.  Our nested IfModules make this quite tricky.
    The better final solution is possibly to add things like HAS_SCOREBOARD
    to the 'build-in' defines, therefore assuring a simple test for any
    mpm architecture.
  
  Revision  Changes    Path
  1.54      +61 -70    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.53
  retrieving revision 1.54
  diff -u -r1.53 -r1.54
  --- httpd-win.conf	10 Jan 2002 08:47:21 -0000	1.53
  +++ httpd-win.conf	10 Jan 2002 21:35:05 -0000	1.54
  @@ -47,6 +47,11 @@
   # ServerRoot: The top of the directory tree under which the server's
   # configuration, error, and log files are kept.
   #
  +# 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://httpd.apache.org/docs-2.0/mod/core.html#lockfile>);
  +# you will save yourself a lot of trouble.
  +#
   # Do NOT add a slash at the end of the directory path.
   #
   ServerRoot "@@ServerRoot@@"
  @@ -121,6 +126,9 @@
   # Statically compiled modules (those listed by `httpd -l') do not need
   # to be loaded here.
   #
  +# Example:
  +# LoadModule foo_module modules/mod_foo.so
  +#
   LoadModule access_module modules/mod_access.so
   LoadModule actions_module modules/mod_actions.so
   LoadModule alias_module modules/mod_alias.so
  @@ -209,7 +217,7 @@
   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). 
   #
  @@ -234,18 +242,23 @@
   <Directory "@@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 the keywords:
  +#   Options FileInfo AuthConfig Limit
   #
       AllowOverride None
   
  @@ -255,19 +268,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.
   #
  @@ -295,14 +299,18 @@
   #</Directory>
   
   #
  -# 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
   
  @@ -705,45 +713,44 @@
   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
   
   #
  -# 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
   
  +# 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
  @@ -754,29 +761,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.
  @@ -832,24 +825,22 @@
   </IfModule>
   
   #
  -# 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 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.
  +# The following directives modify normal HTTP response behavior to
  +# handle known problems with browser implementations.
   #
   BrowserMatch "Mozilla/2" nokeepalive
   BrowserMatch "MSIE 4\.0b2;" nokeepalive downgrade-1.0 force-response-1.0
  -
  -#
  -# The following directive disables HTTP/1.1 responses to browsers which
  -# are in violation of the HTTP/1.0 spec by not being able to grok a
  -# basic 1.1 response.
  -#
   BrowserMatch "RealPlayer 4\.0" force-response-1.0
   BrowserMatch "Java/1\.0" force-response-1.0
   BrowserMatch "JDK/1\.0" force-response-1.0
  +
  +#
  +# The following directive disables redirects on non-GET requests for
  +# 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.
  +#
  +#BrowserMatch "Microsoft Data Access Internet Publishing Provider" redirect-carefully
   
   #
   # Allow server status reports, with the URL of http://servername/server-status
  
  
  
  1.76      +1 -0      httpd-2.0/docs/conf/httpd-std.conf
  
  Index: httpd-std.conf
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/conf/httpd-std.conf,v
  retrieving revision 1.75
  retrieving revision 1.76
  diff -u -r1.75 -r1.76
  --- httpd-std.conf	10 Jan 2002 03:19:49 -0000	1.75
  +++ httpd-std.conf	10 Jan 2002 21:35:05 -0000	1.76
  @@ -213,6 +213,7 @@
   #
   # Example:
   # LoadModule foo_module modules/mod_foo.so
  +#
   @@LoadModule@@
   
   #
  
  
  

Mime
View raw message