Regenerate after previous commits.

This commit is contained in:
Ruslan Ermilov 2011-09-08 13:28:25 +00:00
parent b39c482985
commit 16d873aa70
2 changed files with 28 additions and 28 deletions

View File

@ -147,9 +147,9 @@ into a file.
This directive can be used during debugging, or when using the This directive can be used during debugging, or when using the
<code>$request_body_file</code> <code>$request_body_file</code>
variable, or the variable, or the
<u>$r-&gt;request_body_file</u> <a href="ngx_http_perl_module.html#methods">$r-&gt;request_body_file</a>
method of the method of the
<u>http_perl</u> module. <a href="ngx_http_perl_module.html">http_perl</a> module.
</p><p> </p><p>
When set to the value <code>on</code>, temporary files are not When set to the value <code>on</code>, temporary files are not
removed after request processing. removed after request processing.
@ -239,8 +239,8 @@ If <code><i>size</i></code> is greater than the configured value, the
<i>"Request Entity Too Large"</i> (413) <i>"Request Entity Too Large"</i> (413)
error is returned to a client. error is returned to a client.
Please be aware that Please be aware that
<u>browsers cannot correctly display <a href="/web/upload.html">browsers cannot correctly display
this error</u>. this error</a>.
</p><hr><a name="default_type"></a><strong>syntax</strong>: </p><hr><a name="default_type"></a><strong>syntax</strong>:
<code>default_type <code><i>mime-type</i></code></code><br><strong>default</strong>: <code>default_type <code><i>mime-type</i></code></code><br><strong>default</strong>:
<code>default_type text/plain</code><br><strong>context</strong>: <code>default_type text/plain</code><br><strong>context</strong>:
@ -283,7 +283,7 @@ using XFS under Linux, it needs to be increased to 4K.
Defines the URI that will be shown for the specified errors. Defines the URI that will be shown for the specified errors.
These directives are inherited from the previous level if and These directives are inherited from the previous level if and
only if there are no only if there are no
<u>error_page</u> <code>error_page</code>
directives on directives on
the current level. the current level.
A URI value can contain variables. A URI value can contain variables.
@ -351,12 +351,12 @@ requests redirected by the <a href="#error_page">error_page</a> directive;
subrequests formed by the subrequests formed by the
<code>include virtual</code> <code>include virtual</code>
command of the command of the
<u>http_ssi</u> module; <a href="ngx_http_ssi_module.html">http_ssi</a> module;
</li><li> </li><li>
requests changed by the requests changed by the
<u>rewrite</u> <a href="ngx_http_rewrite_module.html#rewrite">rewrite</a>
directive of the directive of the
<u>http_rewrite</u> module. <a href="ngx_http_rewrite_module.html">http_rewrite</a> module.
</li></ul></p><p> </li></ul></p><p>
Example: Example:
<blockquote><pre> <blockquote><pre>
@ -414,9 +414,9 @@ into the keep-alive state, these buffers are freed.
Limits allowed HTTP methods inside a location. Limits allowed HTTP methods inside a location.
The GET method also implies the HEAD method. The GET method also implies the HEAD method.
Access to other methods can be limited using the Access to other methods can be limited using the
<u>http_access</u> <a href="ngx_http_access_module.html">http_access</a>
and and
<u>http_auth_basic</u> <a href="ngx_http_auth_basic_module.html">http_auth_basic</a>
modules directives: modules directives:
<blockquote><pre> <blockquote><pre>
limit_except GET { limit_except GET {
@ -667,13 +667,13 @@ used for request redirection.
<code>log_not_found on</code><br><strong>context</strong>: <code>log_not_found on</code><br><strong>context</strong>:
<code>http</code>, <code>server</code>, <code>location</code><br><p> <code>http</code>, <code>server</code>, <code>location</code><br><p>
Enables or disables logging of errors about not found files into the Enables or disables logging of errors about not found files into the
<u>error_log</u>. <a href="../ngx_core_module.html#error_log">error_log</a>.
</p><hr><a name="log_subrequest"></a><strong>syntax</strong>: </p><hr><a name="log_subrequest"></a><strong>syntax</strong>:
<code>log_subrequest <code>on</code> | <code>off</code></code><br><strong>default</strong>: <code>log_subrequest <code>on</code> | <code>off</code></code><br><strong>default</strong>:
<code>log_subrequest off</code><br><strong>context</strong>: <code>log_subrequest off</code><br><strong>context</strong>:
<code>http</code>, <code>server</code>, <code>location</code><br><p> <code>http</code>, <code>server</code>, <code>location</code><br><p>
Enables or disables logging of subrequests into the Enables or disables logging of subrequests into the
<u>access_log</u>. <a href="ngx_http_log_module.html#access_log">access_log</a>.
</p><hr><a name="merge_slashes"></a><strong>syntax</strong>: </p><hr><a name="merge_slashes"></a><strong>syntax</strong>:
<code>merge_slashes <code>on</code> | <code>off</code></code><br><strong>default</strong>: <code>merge_slashes <code>on</code> | <code>off</code></code><br><strong>default</strong>:
<code>merge_slashes on</code><br><strong>context</strong>: <code>merge_slashes on</code><br><strong>context</strong>:
@ -803,7 +803,7 @@ On FreeBSD, the
<code>fcntl(O_READAHEAD,</code><code><i>size</i></code><code>)</code> <code>fcntl(O_READAHEAD,</code><code><i>size</i></code><code>)</code>
system call is used, supported in FreeBSD 9.0-CURRENT. system call is used, supported in FreeBSD 9.0-CURRENT.
FreeBSD 7 needs to be FreeBSD 7 needs to be
<u>patched</u>. <a href="http://sysoev.ru/freebsd/patch.readahead.txt">patched</a>.
</p><hr><a name="recursive_error_pages"></a><strong>syntax</strong>: </p><hr><a name="recursive_error_pages"></a><strong>syntax</strong>:
<code>recursive_error_pages <code>on</code> | <code>off</code></code><br><strong>default</strong>: <code>recursive_error_pages <code>on</code> | <code>off</code></code><br><strong>default</strong>:
<code>recursive_error_pages off</code><br><strong>context</strong>: <code>recursive_error_pages off</code><br><strong>context</strong>:
@ -866,8 +866,8 @@ If a URI need to be modified, the
<code>satisfy all</code><br><strong>context</strong>: <code>satisfy all</code><br><strong>context</strong>:
<code>location</code><br><p> <code>location</code><br><p>
Allows access if any of the Allows access if any of the
<u>http_access</u> <a href="ngx_http_access_module.html">http_access</a>
or <u>http_auth_basic</u> or <a href="ngx_http_auth_basic_module.html">http_auth_basic</a>
modules grant access. modules grant access.
<blockquote><pre> <blockquote><pre>
location / { location / {
@ -911,8 +911,8 @@ Instead, the <a href="#listen">listen</a> directives describe all
addresses and ports that should accept connections for a server, and the addresses and ports that should accept connections for a server, and the
<a href="#server_name">server_name</a> directive lists all server names. <a href="#server_name">server_name</a> directive lists all server names.
An example configuration is provided in the An example configuration is provided in the
<u> <a href="../virtual_hosts.html">
Setting Up Virtual Servers</u> document. Setting Up Virtual Servers</a> document.
</p><hr><a name="server_name"></a><strong>syntax</strong>: </p><hr><a name="server_name"></a><strong>syntax</strong>:
<code>server_name <code><i>name</i></code> ...</code><br><strong>default</strong>: <code>server_name <code><i>name</i></code> ...</code><br><strong>default</strong>:
<code>server_name hostname</code><br><strong>context</strong>: <code>server_name hostname</code><br><strong>context</strong>:
@ -1015,7 +1015,7 @@ If this field is not present, an IP address of the server is used.
<code>http</code><br><p> <code>http</code><br><p>
Sets the maximum <code><i>size</i></code> of the server names hash tables. Sets the maximum <code><i>size</i></code> of the server names hash tables.
For more information, please refer to For more information, please refer to
<u>Setting Up Hashes</u>. <a href="../hash.html">Setting Up Hashes</a>.
</p><hr><a name="server_names_hash_bucket_size"></a><strong>syntax</strong>: </p><hr><a name="server_names_hash_bucket_size"></a><strong>syntax</strong>:
<code>server_names_hash_bucket_size <code><i>size</i></code></code><br><strong>default</strong>: <code>server_names_hash_bucket_size <code><i>size</i></code></code><br><strong>default</strong>:
<code>server_names_hash_bucket_size 32/64/128</code><br><strong>context</strong>: <code>server_names_hash_bucket_size 32/64/128</code><br><strong>context</strong>:
@ -1023,7 +1023,7 @@ For more information, please refer to
Sets the bucket size for the server names hash tables. Sets the bucket size for the server names hash tables.
Default value depends on the size of the processor's cache line. Default value depends on the size of the processor's cache line.
For more information, please refer to For more information, please refer to
<u>Setting Up Hashes</u>. <a href="../hash.html">Setting Up Hashes</a>.
</p><hr><a name="server_tokens"></a><strong>syntax</strong>: </p><hr><a name="server_tokens"></a><strong>syntax</strong>:
<code>server_tokens <code>on</code> | <code>off</code></code><br><strong>default</strong>: <code>server_tokens <code>on</code> | <code>off</code></code><br><strong>default</strong>:
<code>server_tokens on</code><br><strong>context</strong>: <code>server_tokens on</code><br><strong>context</strong>:
@ -1241,9 +1241,9 @@ request body
<p> <p>
The variable's value is made available in locations The variable's value is made available in locations
processed by the processed by the
<u>proxy_pass</u> <a href="ngx_http_proxy_module.html#proxy_pass">proxy_pass</a>
and and
<u>fastcgi_pass</u> <a href="ngx_http_fastcgi_module.html#fastcgi_pass">fastcgi_pass</a>
directives. directives.
</p></dd><dt><code>$request_body_file</code></dt><dd> </p></dd><dt><code>$request_body_file</code></dt><dd>
name of a temporary file with the request body name of a temporary file with the request body
@ -1255,15 +1255,15 @@ needs be specified.
When passing the name of a temporary file in a proxied request, When passing the name of a temporary file in a proxied request,
or in a request to a FastCGI server, or in a request to a FastCGI server,
passing of the request body should be disabled by the passing of the request body should be disabled by the
<u>proxy_pass_request_body</u> <a href="ngx_http_proxy_module.html#proxy_pass_request_body">proxy_pass_request_body</a>
and and
<u>fastcgi_pass_request_body</u> <a href="ngx_http_fastcgi_module.html#fastcgi_pass_request_body">fastcgi_pass_request_body</a>
directives, respectively. directives, respectively.
</p></dd><dt><code>$request_uri</code></dt><dd> </p></dd><dt><code>$request_uri</code></dt><dd>
full original request URI (with arguments) full original request URI (with arguments)
</dd><dt><code>$query_string</code></dt><dd> </dd><dt><code>$query_string</code></dt><dd>
same as <code>$args</code></dd><dt><code>$scheme</code></dt><dd> same as <code>$args</code></dd><dt><code>$scheme</code></dt><dd>
request scheme, &ldquo;<code>http</code>&rdquo; or &ldquo;<code>https</code>&gt;&rdquo;</dd><dt><code>$server_protocol</code></dt><dd> request scheme, &ldquo;<code>http</code>&rdquo; or &ldquo;<code>https</code>&rdquo;</dd><dt><code>$server_protocol</code></dt><dd>
request protocol, usually request protocol, usually
&ldquo;<code>HTTP/1.0</code>&rdquo; &ldquo;<code>HTTP/1.0</code>&rdquo;
or or

View File

@ -24,11 +24,11 @@ Allows to limit a set of environment variables, change their values,
or create new environment variables, for the following cases: or create new environment variables, for the following cases:
<ul><li> <ul><li>
variable inheritance during a variable inheritance during a
<u>live upgrade</u> <a href="control.html#upgrade">live upgrade</a>
of an executable file; of an executable file;
</li><li> </li><li>
use of variables by the use of variables by the
<u>http_perl</u> <a href="http/ngx_http_perl_module.html">http_perl</a>
module; module;
</li><li> </li><li>
use of variables by worker processes. use of variables by worker processes.
@ -37,11 +37,11 @@ is not always possible as it is not uncommon for libraries to check
variables only during initialization, well before they can be set variables only during initialization, well before they can be set
using this directive. using this directive.
An exception from this is an above mentioned An exception from this is an above mentioned
<u>live upgrade</u> <a href="control.html#upgrade">live upgrade</a>
of an executable file. of an executable file.
</li></ul></p><p> </li></ul></p><p>
The TZ variable is always inherited and made available to the The TZ variable is always inherited and made available to the
<u>http_perl</u> <a href="http/ngx_http_perl_module.html">http_perl</a>
module, unless configured explicitly. module, unless configured explicitly.
</p><p> </p><p>
Usage example: Usage example: