From: Joshua Slive Date: Sun, 3 Apr 2005 02:02:04 +0000 (+0000) Subject: 1. Shorten some comments. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c754665c80029e034f8ec293722af1e1304102a6;p=thirdparty%2Fapache%2Fhttpd.git 1. Shorten some comments. 2. Move ExtendedStatus into extra/httpd-info.conf. 3. Remove type-map support from the default config. (It is no longer necessary because the multi-lingual welcome page has been removed.) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/simple-conf@159864 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/conf/extra/httpd-info.conf b/docs/conf/extra/httpd-info.conf index 7d2d162eb50..db316c032e1 100644 --- a/docs/conf/extra/httpd-info.conf +++ b/docs/conf/extra/httpd-info.conf @@ -17,6 +17,12 @@ Allow from .example.com +# +# ExtendedStatus controls whether Apache will generate "full" status +# information (ExtendedStatus On) or just basic information (ExtendedStatus +# Off) when the "server-status" handler is called. The default is Off. +# +#ExtendedStatus On # # Allow remote server configuration reports, with the URL of diff --git a/docs/conf/httpd-std.conf.in b/docs/conf/httpd-std.conf.in index 6efe1639432..153bba73b78 100644 --- a/docs/conf/httpd-std.conf.in +++ b/docs/conf/httpd-std.conf.in @@ -29,49 +29,26 @@ # ### Section 1: Global Environment -# -# The directives in this section affect the overall operation of Apache, -# such as the number of concurrent requests it can handle or where it -# can find its configuration files. -# # # 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 ); -# you will save yourself a lot of trouble. -# # Do NOT add a slash at the end of the directory path. # ServerRoot "@@ServerRoot@@" -# -# The accept serialization lock file MUST BE STORED ON A LOCAL DISK. +# NOTE! The following two directives are used on some systems +# to coordinate the httpd children. THEY MUST BE STORED ON +# A LOCAL DISK! # # # #LockFile @rel_logfiledir@/accept.lock -# -# - -# -# ScoreBoardFile: File used to store internal server process information. -# If unspecified (the default), the scoreboard will be stored in an -# anonymous shared memory segment, and will be unavailable to third-party -# applications. -# If specified, ensure that no two invocations of Apache share the same -# scoreboard file. The scoreboard file MUST BE STORED ON A LOCAL DISK. -# -# -# #ScoreBoardFile @rel_logfiledir@/apache_runtime_status # # - # # PidFile: The file in which the server should record its process # identification number when it starts. @@ -130,13 +107,6 @@ Listen @@Port@@ # @@LoadModule@@ -# -# ExtendedStatus controls whether Apache will generate "full" status -# information (ExtendedStatus On) or just basic information (ExtendedStatus -# Off) when the "server-status" handler is called. The default is Off. -# -#ExtendedStatus On - ### Section 2: 'Main' server configuration # # The directives in this section set up the values used by the 'main' @@ -180,9 +150,6 @@ ServerAdmin you@example.com # This can often be determined automatically, but we recommend you specify # it explicitly 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. -# # If your host doesn't have a registered DNS name, enter its IP address here. # You will have to access it by its address anyway, and this will make # redirections work in a sensible way. @@ -265,12 +232,8 @@ DocumentRoot "@exp_htdocsdir@" # 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 index.html.var + DirectoryIndex index.html # @@ -295,7 +258,6 @@ AccessFileName .htaccess # to be found. # TypesConfig @rel_sysconfdir@/mime.types - # @@ -328,23 +290,14 @@ DefaultType text/plain # 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.1/mod/core.html#enablemmap +# EnableMMAP and EnableSendfile: On systems that support it, +# memory-mapping or the sendfile syscall is used to deliver +# files. This usually improves server performance, but must +# be turned off when serving from networked-mounted +# filesystems or if support for these functions is otherwise +# broken on your system. # #EnableMMAP off - -# -# EnableSendfile: Control whether the sendfile kernel support is -# used to deliver files (assuming that the OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. Please see -# http://httpd.apache.org/docs-2.1/mod/core.html#enablesendfile -# #EnableSendfile off # @@ -542,10 +495,8 @@ ServerSignature On # # For type maps (negotiated resources): - # (This is enabled by default to allow the Apache "It Worked" page - # to be distributed in multiple languages.) # - AddHandler type-map var + #AddHandler type-map var # # Filters allow you to process content before it is sent to the client. @@ -632,6 +583,7 @@ ServerSignature On # # Secure (SSL/TLS) connections # Include @rel_sysconfdir@/extra/httpd-ssl.conf +# # Note: The following must must be present to support # starting without SSL on platforms with no /dev/random equivalent # but a statically compiled-in mod_ssl.