Mercurial > hg > nginx-site
changeset 82:89c31b453d40
Sorted directives alphabetically.
author | Ruslan Ermilov <ru@nginx.com> |
---|---|
date | Thu, 13 Oct 2011 07:57:44 +0000 |
parents | 5a2dcd623666 |
children | e8ed74d3fa0e |
files | xml/en/docs/http/ngx_http_core_module.xml xml/en/docs/ngx_core_module.xml |
diffstat | 2 files changed, 71 insertions(+), 71 deletions(-) [+] |
line wrap: on
line diff
--- a/xml/en/docs/http/ngx_http_core_module.xml +++ b/xml/en/docs/http/ngx_http_core_module.xml @@ -187,6 +187,27 @@ location /images/ { </directive> +<directive name="client_body_buffer_size"> + +<syntax>client_body_buffer_size <argument>size</argument></syntax> +<default>client_body_buffer_size 8k|16k</default> +<context>http</context> +<context>server</context> +<context>location</context> + +<para> +Sets buffer size for reading client request body. +In case request body is larger than the buffer, +the whole body or only its part is written to a +<link id="client_body_temp_path">temporary file</link>. +By default, buffer size is equal to two memory pages. +This is 8K on x86, other 32-bit platforms, and x86-64. +It is usually 16K on other 64-bit platforms. +</para> + +</directive> + + <directive name="client_body_in_file_only"> <syntax>client_body_in_file_only <value>on</value> | @@ -241,27 +262,6 @@ variable, to save the number of copy ope </directive> -<directive name="client_body_buffer_size"> - -<syntax>client_body_buffer_size <argument>size</argument></syntax> -<default>client_body_buffer_size 8k|16k</default> -<context>http</context> -<context>server</context> -<context>location</context> - -<para> -Sets buffer size for reading client request body. -In case request body is larger than the buffer, -the whole body or only its part is written to a -<link id="client_body_temp_path">temporary file</link>. -By default, buffer size is equal to two memory pages. -This is 8K on x86, other 32-bit platforms, and x86-64. -It is usually 16K on other 64-bit platforms. -</para> - -</directive> - - <directive name="client_body_temp_path"> <syntax>client_body_temp_path <argument>path</argument> @@ -1794,20 +1794,6 @@ If this field is not present, an IP addr </directive> -<directive name="server_names_hash_max_size"> -<syntax>server_names_hash_max_size <argument>size</argument></syntax> -<default>server_names_hash_max_size 512</default> -<context>http</context> - -<para> -Sets the maximum <argument>size</argument> of the server names hash tables. -For more information, please refer to -<link doc="../hash.xml">Setting Up Hashes</link>. -</para> - -</directive> - - <directive name="server_names_hash_bucket_size"> <syntax>server_names_hash_bucket_size <argument>size</argument></syntax> <default>server_names_hash_bucket_size 32|64|128</default> @@ -1823,6 +1809,20 @@ For more information, please refer to </directive> +<directive name="server_names_hash_max_size"> +<syntax>server_names_hash_max_size <argument>size</argument></syntax> +<default>server_names_hash_max_size 512</default> +<context>http</context> + +<para> +Sets the maximum <argument>size</argument> of the server names hash tables. +For more information, please refer to +<link doc="../hash.xml">Setting Up Hashes</link>. +</para> + +</directive> + + <directive name="server_tokens"> <syntax>server_tokens <value>on</value> | <value>off</value></syntax> <default>server_tokens on</default> @@ -2136,7 +2136,7 @@ For more information, please refer to The module <code>ngx_http_core_module</code> supports embedded variables with names matching those of the Apache Server. First of all, these are variables representing client request header -fields, such as, <var>$http_user_agent</var>, <var>$http_cookie</var>, +fields, such as <var>$http_user_agent</var>, <var>$http_cookie</var>, and so on. It also supports other variables: <list type="tag">
--- a/xml/en/docs/ngx_core_module.xml +++ b/xml/en/docs/ngx_core_module.xml @@ -154,21 +154,6 @@ Defines the name of the hardware SSL acc </directive> -<directive name="user"> -<syntax>user <argument>user</argument> [<argument>group</argument>]</syntax> -<default>user nobody nobody</default> -<context>main</context> - -<para> -Defines <argument>user</argument> and <argument>group</argument> -credentials used by worker processes. -If <argument>group</argument> is omitted, a group whose name equals -that of <argument>user</argument> is used. -</para> - -</directive> - - <directive name="timer_resolution"> <syntax>timer_resolution <argument>interval</argument></syntax> <default/> @@ -212,29 +197,16 @@ an <c-def>EVFILT_TIMER</c-def> filter if </directive> -<directive name="worker_rlimit_core"> -<syntax>worker_rlimit_core <argument>size</argument></syntax> -<default/> +<directive name="user"> +<syntax>user <argument>user</argument> [<argument>group</argument>]</syntax> +<default>user nobody nobody</default> <context>main</context> <para> -Changes the limit on the largest size of a core file -(<c-def>RLIMIT_CORE</c-def>) for worker processes. -Used to increase the limit without restarting the main process. -</para> - -</directive> - - -<directive name="worker_rlimit_nofile"> -<syntax>worker_rlimit_nofile <argument>number</argument></syntax> -<default/> -<context>main</context> - -<para> -Changes the limit on the maximum number of open files -(<c-def>RLIMIT_NOFILE</c-def>) for worker processes. -Used to increase the limit without restarting the main process. +Defines <argument>user</argument> and <argument>group</argument> +credentials used by worker processes. +If <argument>group</argument> is omitted, a group whose name equals +that of <argument>user</argument> is used. </para> </directive> @@ -275,6 +247,34 @@ Defines the number of worker processes. </directive> +<directive name="worker_rlimit_core"> +<syntax>worker_rlimit_core <argument>size</argument></syntax> +<default/> +<context>main</context> + +<para> +Changes the limit on the largest size of a core file +(<c-def>RLIMIT_CORE</c-def>) for worker processes. +Used to increase the limit without restarting the main process. +</para> + +</directive> + + +<directive name="worker_rlimit_nofile"> +<syntax>worker_rlimit_nofile <argument>number</argument></syntax> +<default/> +<context>main</context> + +<para> +Changes the limit on the maximum number of open files +(<c-def>RLIMIT_NOFILE</c-def>) for worker processes. +Used to increase the limit without restarting the main process. +</para> + +</directive> + + <directive name="working_directory"> <syntax>working_directory <argument>directory</argument></syntax> <default/>