From: Nilgun Belma Buguner Date: Fri, 3 Dec 2010 17:37:42 +0000 (+0000) Subject: fixed validation error X-Git-Tag: 2.2.18~273 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d86fdc7253854b801c1db477888b80a6407641c;p=thirdparty%2Fapache%2Fhttpd.git fixed validation error git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1041924 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml index af4eb36cb6c..8273d1053e3 100644 --- a/docs/manual/mod/core.xml +++ b/docs/manual/mod/core.xml @@ -35,12 +35,12 @@ available Available in Apache 2.1.5 and later -

This directive enables operating system specific optimizations for a - listening socket by the Protocol type. The basic premise is for the - kernel to not send a socket to the server process until either data +

This directive enables operating system specific optimizations for a + listening socket by the Protocol type. The basic premise is for the + kernel to not send a socket to the server process until either data is received or an entire HTTP Request is buffered. Only - FreeBSD's Accept Filters and Linux's more primitive + FreeBSD's Accept Filters and Linux's more primitive TCP_DEFER_ACCEPT are currently supported.

The default values on FreeBSD are:

@@ -48,12 +48,12 @@ available AcceptFilter http httpready
AcceptFilter https dataready - +

The httpready accept filter buffers entire HTTP requests at - the kernel level. Once an entire request is received, the kernel then - sends it to the server. See the + the kernel level. Once an entire request is received, the kernel then + sends it to the server. See the - accf_http(9) man page for more details. Since HTTPS requests are + accf_http(9) man page for more details. Since HTTPS requests are encrypted only the accf_data(9) filter is used.

@@ -64,13 +64,13 @@ available

Linux's TCP_DEFER_ACCEPT does not support buffering http - requests. Any value besides none will enable + requests. Any value besides none will enable TCP_DEFER_ACCEPT on that listener. For more details - see the Linux + see the Linux tcp(7) man page.

-

Using none for an argument will disable any accept filters +

Using none for an argument will disable any accept filters for that protocol. This is useful for protocols that require a server send data first, such as nntp:

AcceptFilter nntp none @@ -464,7 +464,7 @@ be passed through server error.

For security and performance reasons, do not set - AllowOverride to anything other than None + AllowOverride to anything other than None in your <Directory /> block. Instead, find (or create) the <Directory> block that refers to the directory where you're actually planning to place a @@ -534,10 +534,10 @@ authentication server must have an authentication-provider module such as mod_authn_file and an authorization module such as mod_authz_user.

- + Authentication, Authorization, - and Access Control + and Access Control @@ -660,7 +660,7 @@ named file-system directory, sub-directories, and their contents

Directory and </Directory> are used to enclose a group of directives that will apply only to the named directory, - sub-directories of that directory, and the files within the respective + sub-directories of that directory, and the files within the respective directories. Any directive that is allowed in a directory context may be used. Directory-path is either the full path to a directory, or a wild-card string using @@ -805,7 +805,7 @@ subdirectories of directives which will apply only to the named directory and sub-directories of that directory (and the files within), the same as Directory. However, it - takes as an argument a regular + takes as an argument a regular expression. For example:

@@ -851,8 +851,8 @@ from the web

then an access to http://www.my.host.com/index.html refers to - /usr/web/index.html. If the directory-path is - not absolute then it is assumed to be relative to the /usr/web/index.html. If the directory-path is + not absolute then it is assumed to be relative to the ServerRoot.

The DocumentRoot should be specified without @@ -1098,7 +1098,7 @@ in case of an error

The ErrorLog directive sets the name of the file to which the server will log any errors it encounters. If - the file-path is not absolute then it is assumed to be + the file-path is not absolute then it is assumed to be relative to the ServerRoot.

Example @@ -1135,7 +1135,7 @@ in case of an error Note

When entering a file path on non-Unix platforms, care should be taken to make sure that only forward slashes are used even though the platform - may allow the use of back slashes. In general it is a good idea to always + may allow the use of back slashes. In general it is a good idea to always use forward slashes throughout the configuration files.

 @@ -1203,8 +1203,8 @@ HTTP response header for static files changed via FileETag. Server Side Includes - An ETag is not generated for responses parsed by mod_include, - since the response entity can change without a change of the INode, MTime, or Size + An ETag is not generated for responses parsed by mod_include, + since the response entity can change without a change of the INode, MTime, or Size of the static file with embedded SSI directives. @@ -1243,7 +1243,7 @@ filenames

The filename argument should include a filename, or a wild-card string, where ? matches any single character, and * matches any sequences of characters. - Regular expressions + Regular expressions can also be used, with the addition of the ~ character. For example:

@@ -1282,7 +1282,7 @@ filenames

The FilesMatch directive limits the scope of the enclosed directives by filename, just as the Files directive - does. However, it accepts a regular + does. However, it accepts a regular expression. For example:

@@ -1360,7 +1360,7 @@ MIME content-type argument ends with a percent symbol ('%'), subdirectories are created for each process id.

-

This directive currently only works with the prefork +

This directive currently only works with the prefork MPM.

 @@ -1557,7 +1557,7 @@ the server configuration files files in a directory that can cause httpd to fail.

-

The file path specified may be an absolute path, or may be relative +

The file path specified may be an absolute path, or may be relative to the ServerRoot directory.

Examples:

@@ -1635,7 +1635,7 @@ requests on a persistent connection may cause performance problems in heavily loaded servers. The higher the timeout, the more server processes will be kept occupied waiting on connections with idle clients.

- +

In a name-based virtual host context, the value of the first defined virtual host (the default host) in a set of NameVirtualHost will be used. @@ -1853,7 +1853,7 @@ will be accepted from the client Warning -

When name-based virtual hosting is used, the value for this +

When name-based virtual hosting is used, the value for this directive is taken from the default (first-listed) virtual host for the NameVirtualHost the connection was mapped to.

@@ -1874,11 +1874,11 @@ client that will be allowed in an HTTP request header.

The LimitRequestFieldSize directive - allows the server administrator to reduce or increase the limit + allows the server administrator to reduce or increase the limit on the allowed size of an HTTP request header field. A server - needs this value to be large enough to hold any one header field - from a normal client request. The size of a normal request header - field will vary greatly among different client implementations, + needs this value to be large enough to hold any one header field + from a normal client request. The size of a normal request header + field will vary greatly among different client implementations, often depending upon the extent to which a user has configured their browser to support detailed content negotiation. SPNEGO authentication headers can be up to 12392 bytes.

@@ -1897,7 +1897,7 @@ client the default. Warning -

When name-based virtual hosting is used, the value for this +

When name-based virtual hosting is used, the value for this directive is taken from the default (first-listed) virtual host for the NameVirtualHost the connection was mapped to.

 @@ -1914,7 +1914,7 @@ from the client server configvirtual host -

This directive sets the number of bytes that will be +

This directive sets the number of bytes that will be allowed on the HTTP request-line.

The LimitRequestLine directive allows @@ -1941,7 +1941,7 @@ from the client the default. Warning -

When name-based virtual hosting is used, the value for this +

When name-based virtual hosting is used, the value for this directive is taken from the default (first-listed) virtual host for the NameVirtualHost the connection was mapped to.

@@ -2000,34 +2000,33 @@ URLs filesystem location, such access controls may by circumvented.

The enclosed directives will be applied to the request if the path component - of the URL meets any of the following criteria: + of the URL meets any of the following criteria:

- In the example below, where no trailing slash is used, requests to +

In the example below, where no trailing slash is used, requests to /private1, /private1/ and /private1/file.txt will have the enclosed - directives applied, but /private1other would not. + directives applied, but /private1other would not.

<Location /private1> ... - In the example below, where a trailing slash is used, requests to +

In the example below, where a trailing slash is used, requests to /private2/ and /private2/file.txt will have the enclosed - directives applied, but /private2 and /private2other would not. + directives applied, but /private2 and /private2other would not.

<Location /private2/> ... -

- When to use <directive + <note><title>When to use <directive type="section">Location</directive>

Use Location to apply @@ -2035,7 +2034,7 @@ URLs content that lives in the filesystem, use Directory and Files. An exception is - <Location />, which is an easy way to + <Location />, which is an easy way to apply a configuration to the entire server.

 @@ -2538,7 +2537,7 @@ a resource

This directive selects which authenticated users can access a resource. Multipe instances of this directive are combined with a logical - "OR", such that a user matching any Require line is + "OR", such that a user matching any Require line is granted access. The restrictions are processed by authorization modules. Some of the allowed syntaxes provided by mod_authz_user and @@ -2584,8 +2583,8 @@ a resource place the Require statement into a Limit section.

- -

If Require is used together with + +

If Require is used together with the Allow or Deny directives, then the interaction of these restrictions is controlled by @@ -2614,11 +2613,11 @@ a resource </Directory>
- + Authentication, Authorization, - and Access Control + and Access Control Satisfy mod_authz_host @@ -2955,7 +2954,7 @@ itself

Additionally, ServerName is used (possibly in conjunction with ServerAlias) to uniquely identify a virtual host, when using name-based virtual hosts.

- +

For example, if the name of the machine hosting the web server is simple.example.com, but the machine also has the DNS alias www.example.com @@ -2988,7 +2987,7 @@ itself https:// scheme and the port number to which the clients connect in the ServerName directive to make sure that the server generates the correct - self-referential URLs. + self-referential URLs.

See the description of the @@ -3039,7 +3038,7 @@ is accessed by an incompatible browser subdirectories conf/ and logs/. Relative paths in other configuration directives (such as Include or LoadModule, for example) are taken as + module="mod_so">LoadModule, for example) are taken as relative to this directory.

Example @@ -3310,7 +3309,7 @@ requests allowed) error to the client.

Finally, for testing and diagnostic purposes only, request - bodies may be allowed using the non-compliant TraceEnable + bodies may be allowed using the non-compliant TraceEnable extended directive. The core (as an origin server) will restrict the request body to 64k (plus 8k for chunk headers if Transfer-Encoding: chunked is used). The core will @@ -3417,7 +3416,7 @@ port

  • Port provided in Servername
  • Default port
    • - +

    With UseCanonicalPhysicalPort Off, the physical ports are removed from the ordering.

    diff --git a/docs/manual/mod/core.xml.fr b/docs/manual/mod/core.xml.fr index dc5a176eec3..b00e16c6203 100644 --- a/docs/manual/mod/core.xml.fr +++ b/docs/manual/mod/core.xml.fr @@ -987,7 +987,7 @@ lire les fichiers pendant qu'ils sont servis     - +     @@ -2195,7 +2195,7 @@ spécifiées

    Les directives que contient cette section seront appliquées aux requêtes si la partie chemin de l'URL satisfait à l'un au moins de - ces critères : + ces critères :

    • Le chemin spécifié correspond exactement à la partie chemin de l'URL. @@ -2209,21 +2209,20 @@ spécifiées contexte).
    - Dans l'exemple ci-dessous, où aucun slash de fin n'est utilisé, les +

    Dans l'exemple ci-dessous, où aucun slash de fin n'est utilisé, les directives contenues dans la section s'appliqueront à /private1, - /private1/ et /private1/file.txt, mais pas à /private1other. + /private1/ et /private1/file.txt, mais pas à /private1other.

    <Location /private1> ... - De même, dans l'exemple ci-dessous, où l'on utilise un slash de fin, les +

    De même, dans l'exemple ci-dessous, où l'on utilise un slash de fin, les directives contenues dans la section s'appliqueront à /private2/ et - à /private2/file.txt, mais pas à /private2other. + à /private2/file.txt, mais pas à /private2other.

    <Location /private2/> ... -

    Quand utiliser la section <directive type="section">Location</directive>