From: Daniel Gruno Date: Wed, 25 Apr 2012 19:35:18 +0000 (+0000) Subject: Remove some newlines and white-spaces X-Git-Tag: 2.5.0-alpha~7022 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e44ec32386f8a188208d4ba0440207aa0063cc2;p=thirdparty%2Fapache%2Fhttpd.git Remove some newlines and white-spaces git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1330507 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml index 4d31511e84e..4ddf1405503 100644 --- a/docs/manual/mod/core.xml +++ b/docs/manual/mod/core.xml @@ -49,7 +49,7 @@ On Windows from Apache httpd 2.3.3 and later. for that protocol. This is useful for protocols that require a server send data first, such as ftp: or nntp:

-AcceptFilter nntp none + AcceptFilter nntp none

The default protocol names are https for port 443 @@ -174,9 +174,9 @@ AcceptFilter https data <Files "mypaths.shtml"> - Options +Includes
- SetOutputFilter INCLUDES
- AcceptPathInfo On
+ Options +Includes + SetOutputFilter INCLUDES + AcceptPathInfo On </Files> @@ -198,9 +198,7 @@ AcceptFilter https data configuration files are enabled for that directory. For example:

- -AccessFileName .acl - + AccessFileName .acl

before returning the document /usr/local/web/index.html, the server will read @@ -209,8 +207,8 @@ AccessFileName .acl for directives, unless they have been disabled with

-<Directory />
- AllowOverride None
+<Directory /> + AllowOverride None </Directory> @@ -245,9 +243,7 @@ content-type is text/plain or text/html charset values for use in Internet media types (MIME types). For example:

- -AddDefaultCharset utf-8 - + AddDefaultCharset utf-8

AddDefaultCharset should only be used when all of the text resources to which it applies are known to be in that @@ -458,9 +454,7 @@ NoDecode option available in 2.3.12 and later.

Example:

- -AllowOverride AuthConfig Indexes - + AllowOverride AuthConfig Indexes

In the example above all directives that are neither in the group AuthConfig nor Indexes cause an internal @@ -616,7 +610,7 @@ headers will be relative to ServerRoot

-Example +#Example DefaultRuntimeDir scratch/ @@ -654,9 +648,7 @@ which no other media type configuration could be found. of configuration files, it may be specified with the value none, meaning no default media type. For example:

- -DefaultType None - + DefaultType None

DefaultType None is only available in httpd-2.2.7 and later.

@@ -750,9 +742,7 @@ named file-system directory, sub-directories, and their contents. expressions can also be used, with the addition of the ~ character. For example:

- -<Directory ~ "^/www/.*/[0-9]{3}"> - + <Directory ~ "^/www/.*/[0-9]{3}">

would match directories in /www/ that consisted of three numbers.

@@ -854,9 +844,7 @@ the contents of file-system directories matching a regular expression.regular expression. For example:

- -<DirectoryMatch "^/www/(.+/)?[0-9]{3}"> - + <DirectoryMatch "^/www/(.+/)?[0-9]{3}">

would match directories in /www/ that consisted of three numbers.

@@ -900,9 +888,7 @@ from the web path from the requested URL to the document root to make the path to the document. Example:

- -DocumentRoot "/usr/web" - + DocumentRoot "/usr/web"

then an access to http://my.example.com/index.html refers to @@ -1047,9 +1033,7 @@ for a complete reference and more examples.

For server configurations that are vulnerable to these problems, you should disable memory-mapping of delivered files by specifying:

- -EnableMMAP Off - + EnableMMAP Off

For NFS mounted files, this feature may be disabled explicitly for the offending files by specifying:

@@ -1105,9 +1089,7 @@ version 2.3.9.

For server configurations that are not vulnerable to these problems, you may enable this feature by specifying:

- -EnableSendfile On - + EnableSendfile On

For network mounted files, this feature may be disabled explicitly for the offending files by specifying:

@@ -1142,7 +1124,7 @@ EnableSendfile On modules which are missing from the configuration.

-Example +# Example # ensure that mod_include is loaded <IfModule !include_module> Error mod_include is required by mod_foo. Load it with LoadModule. @@ -1218,7 +1200,6 @@ ErrorDocument 403 Forbidden! ErrorDocument 404 /cgi-bin/bad_urls.pl - <Directory /web/docs> ErrorDocument 404 default </Directory> @@ -1282,17 +1263,13 @@ ErrorDocument 404 /cgi-bin/bad_urls.pl the file-path is not absolute then it is assumed to be relative to the ServerRoot.

- Example -ErrorLog "/var/log/httpd/error_log" - + ErrorLog "/var/log/httpd/error_log"

If the file-path begins with a pipe character "|" then it is assumed to be a command to spawn to handle the error log.

- Example -ErrorLog "|/usr/local/bin/httpd_errors" - + ErrorLog "|/usr/local/bin/httpd_errors"

See the notes on piped logs for more information.

@@ -1306,9 +1283,7 @@ ErrorLog "|/usr/local/bin/httpd_errors" in individual virtual hosts, the final facility specified affects the entire server.

- Example -ErrorLog syslog:user - + ErrorLog syslog:user

SECURITY: See the security tips @@ -1339,7 +1314,8 @@ ErrorLog syslog:user supplementary information is logged in the error log in addition to the actual log message.

- Simple example + +#Simple example ErrorLogFormat "[%t] [%l] [pid %P] %F: %E: [client %a] %M" @@ -1505,7 +1481,8 @@ ErrorLogFormat "[%t] [%l] [pid %P] %F: %E: [client %a] %M" with error log lines. If mod_unique_id is loaded, its unique id will be used as log ID for requests.

- Example (default format) + +#Example (default format) ErrorLogFormat "[%{u}t] [%-m:%l] [pid %P:tid %T] %7F: %E: [client\ %a] %M% ,\ referer\ %{Referer}i" @@ -1518,11 +1495,13 @@ ErrorLogFormat "[%{u}t] [%-m:%l] [pid %P:tid %T] %7F: %E: [client\ %a] %M% 

Notice that, as discussed above, some fields are ommitted entirely because they are not defined.

- Example (similar to the 2.2.x format) + +#Example (similar to the 2.2.x format) ErrorLogFormat "[%t] [%l] %7F: %E: [client\ %a] %M% ,\ referer\ %{Referer}i" - Advanced example with request/connection log IDs + +#Advanced example with request/connection log IDs ErrorLogFormat "[%{uc}t] [%-m:%-l] [R:%L] [C:%{C}L] %7F: %E: %M" ErrorLogFormat request "[%{uc}t] [R:%L] Request %k on C:%{c}L pid:%P tid:%T" ErrorLogFormat request "[%{uc}t] [R:%L] UA:'%+{User-Agent}i'" @@ -1674,9 +1653,7 @@ filenames can also be used, with the addition of the ~ character. For example:

- -<Files ~ "\.(gif|jpe?g|png)$"> - + <Files ~ "\.(gif|jpe?g|png)$">

would match most common Internet graphics formats. FilesMatch is preferred, @@ -1712,9 +1689,7 @@ filenames does. However, it accepts a regular expression. For example:

- -<FilesMatch "\.(gif|jpe?g|png)$"> - + <FilesMatch "\.(gif|jpe?g|png)$">

would match most common Internet graphics formats.

@@ -1745,9 +1720,7 @@ media type in the HTTP Content-Type header field GIF files, but did not want to label them all with .gif, you might want to use:

- -ForceType image/gif - + ForceType image/gif

Note that this directive overrides other indirect media type associations defined in mime.types or via the @@ -1857,9 +1830,7 @@ satisfied by a request at runtime directives if and only if the expression evaluates to true. For example:

- -<If "-z req('Host')"> - + <If "-z req('Host')">

would match HTTP/1.0 requests without a Host: header. Expressions may contain various shell-like operators for string @@ -1868,9 +1839,7 @@ satisfied by a request at runtime and others (-n, -z, -f, ...). It is also possible to use regular expressions,

- -<If "%{QUERY_STRING} =~ /(delete|commit)=.*?elem/"> - + <If "%{QUERY_STRING} =~ /(delete|commit)=.*?elem/">

shell-like pattern matches and many other operations. These operations can be done on request headers (req), environment variables @@ -2048,8 +2017,8 @@ wildcard matching available in 2.3.6 and later

Examples:

- Include /usr/local/apache2/conf/ssl.conf
- Include /usr/local/apache2/conf/vhosts/*.conf +Include /usr/local/apache2/conf/ssl.conf +Include /usr/local/apache2/conf/vhosts/*.conf

Or, providing paths relative to your - -Include conf/vhosts/*/*.conf - + Include conf/vhosts/*/*.conf

Alternatively, the following command will just be ignored in case of missing files or directories:

- -IncludeOptional conf/vhosts/*/*.conf - + IncludeOptional conf/vhosts/*/*.conf @@ -2312,9 +2277,7 @@ subrequests determines, how deep subrequests may be nested. If you specify only one number, it will be assigned to both limits.

- Example -LimitInternalRecursion 5 - + LimitInternalRecursion 5 @@ -2357,9 +2320,7 @@ from the client location, and wish to limit the size of the uploaded file to 100K, you might use the following directive:

- -LimitRequestBody 102400 - + LimitRequestBody 102400

For a full description of how this directive is interpreted by proxy requests, see the mod_proxy documentation.

@@ -2402,9 +2363,7 @@ will be accepted from the client

For example:

- -LimitRequestFields 50 - + LimitRequestFields 50 Warning

When name-based virtual hosting is used, the value for this @@ -2443,9 +2402,7 @@ client

For example:

- -LimitRequestFieldSize 4094 - + LimitRequestFieldSize 4094 Under normal conditions, the value should not be changed from the default. Also, you can't set this higher than 8190 without @@ -2487,9 +2444,7 @@ from the client

For example:

- -LimitRequestLine 4094 - + LimitRequestLine 4094 Under normal conditions, the value should not be changed from the default. Also, you can't set this higher than 8190 without @@ -2519,9 +2474,7 @@ LimitRequestLine 4094

Example:

- -LimitXMLRequestBody 0 - + LimitXMLRequestBody 0 @@ -2613,9 +2566,7 @@ URLs can also be used, with the addition of the ~ character. For example:

- -<Location ~ "/(extra|special)/data"> - + <Location ~ "/(extra|special)/data">

would match URLs that contained the substring /extra/data or /special/data. The directive it takes a regular expression as an argument instead of a simple string. For example:

- -<LocationMatch "/(extra|special)/data"> - + <LocationMatch "/(extra|special)/data">

would match URLs that contained the substring /extra/data or /special/data.

@@ -2861,9 +2810,7 @@ matching URLs

For example:

- -LogLevel notice - + LogLevel notice Note

When logging to a regular file messages of the level @@ -2923,9 +2870,7 @@ connection

For example:

- -MaxKeepAliveRequests 500 - + MaxKeepAliveRequests 500 @@ -3400,12 +3345,12 @@ directory

For example, without any + and - symbols:

-<Directory "/web/docs">
- Options Indexes FollowSymLinks
-</Directory>
+<Directory "/web/docs"> + Options Indexes FollowSymLinks +</Directory> -<Directory "/web/docs/spec">
- Options Includes
+<Directory "/web/docs/spec"> + Options Includes </Directory> @@ -3457,9 +3402,7 @@ On Windows from Apache 2.3.3 and later.

For example, if you are running https on a non-standard port, specify the protocol explicitly:

- -Protocol https - + Protocol https

You can also specify the protocol using the Listen directive.

@@ -3595,15 +3538,11 @@ later by the shebang line (first line, starting with #!) in the script. On Win32 systems this line usually looks like:

- -#!C:/Perl/bin/perl.exe - + #!C:/Perl/bin/perl.exe

or, if perl is in the PATH, simply:

- -#!perl - + #!perl

Setting ScriptInterpreterSource Registry will cause the Windows Registry tree HKEY_CLASSES_ROOT to be @@ -3699,9 +3638,7 @@ messages sent to the client

It may be worth setting up a dedicated address for this, e.g.

- -ServerAdmin www-admin@foo.example.com - + ServerAdmin www-admin@foo.example.com

as users do not always mention that they are talking about the server!

@@ -3766,9 +3703,7 @@ itself and you wish the web server to be so identified, the following directive should be used:

- -ServerName www.example.com - + ServerName www.example.com

The ServerName directive may appear anywhere within the definition of a server. However, @@ -3860,9 +3795,7 @@ is accessed by an incompatible browser module="mod_so">LoadModule, for example) are taken as relative to this directory.

- Example -ServerRoot "/home/httpd" - + ServerRoot "/home/httpd"

The default location of ServerRoot may be modified by using the --prefix argument to @@ -4002,9 +3935,7 @@ handler of extension, you might put the following into an .htaccess file in that directory:

- -SetHandler imap-file - + SetHandler imap-file

Another example: if you wanted to have the server display a status report whenever a URL of