changeset 72:0987079ad08f

- "try_files" can be specified in the "server" context, - "types_hash_bucket_size", "types_hash_max_size", "variables_hash_bucket_size", "variables_hash_max_size" are documented.
author Ruslan Ermilov <ru@nginx.com>
date Mon, 10 Oct 2011 09:23:09 +0000
parents c007b57d617c
children 6327603448e2
files xml/en/docs/http/ngx_http_core_module.xml
diffstat 1 files changed, 67 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/xml/en/docs/http/ngx_http_core_module.xml	Mon Oct 10 08:23:43 2011 +0000
+++ b/xml/en/docs/http/ngx_http_core_module.xml	Mon Oct 10 09:23:09 2011 +0000
@@ -244,7 +244,7 @@
 <directive name="client_body_buffer_size">
 
 <syntax>client_body_buffer_size <argument>size</argument></syntax>
-<default>client_body_buffer_size 8k/16k</default>
+<default>client_body_buffer_size 8k|16k</default>
 <context>http</context>
 <context>server</context>
 <context>location</context>
@@ -1810,7 +1810,7 @@
 
 <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>
+<default>server_names_hash_bucket_size 32|64|128</default>
 <context>http</context>
 
 <para>
@@ -1865,7 +1865,7 @@
 Enables or disables the use of
 the <c-def>TCP_NOPUSH</c-def> socket option on FreeBSD
 or the <c-def>TCP_CORK</c-def> socket option on Linux.
-Opitons are enables only when <link id="sendfile">sendfile</link> is used.
+Opitons are enabled only when <link id="sendfile">sendfile</link> is used.
 Enabling the option allows to
 <list type="bullet">
 
@@ -1894,14 +1894,15 @@
         =<argument>code</argument>
 </syntax>
 <default/>
+<context>server</context>
 <context>location</context>
 
 <para>
 Checks the existence of files in the specified order, and uses
 the first found file for request processing; the processing
-is performed in this location's context.
+is performed in the current context.
 It is possible to check the directory existence by specifying
-the slash at the end of a name, e.g. <dq><code>$uri/</code></dq>.
+a slash at the end of a name, e.g. <dq><code>$uri/</code></dq>.
 If none of the files were found, an internal redirect to the
 <argument>uri</argument> specified by the last argument is made.
 As of version 0.7.51, the last argument can also be a
@@ -2054,6 +2055,39 @@
 </directive>
 
 
+<directive name="types_hash_bucket_size">
+<syntax>types_hash_bucket_size <argument>size</argument></syntax>
+<default>types_hash_bucket_size 32|64|128</default>
+<context>http</context>
+<context>server</context>
+<context>location</context>
+
+<para>
+Sets the bucket size for the types hash tables.
+Default value depends on the size of the processor's cache line.
+For more information, please refer to
+<link doc="../hash.xml">Setting Up Hashes</link>.
+</para>
+
+</directive>
+
+
+<directive name="types_hash_max_size">
+<syntax>types_hash_max_size <argument>size</argument></syntax>
+<default>types_hash_max_size 1024</default>
+<context>http</context>
+<context>server</context>
+<context>location</context>
+
+<para>
+Sets the maximum <argument>size</argument> of the types hash tables.
+For more information, please refer to
+<link doc="../hash.xml">Setting Up Hashes</link>.
+</para>
+
+</directive>
+
+
 <directive name="underscores_in_headers">
 <syntax>underscores_in_headers <value>on</value> | <value>off</value></syntax>
 <default>underscores_in_headers off</default>
@@ -2066,6 +2100,34 @@
 
 </directive>
 
+
+<directive name="variables_hash_bucket_size">
+<syntax>variables_hash_bucket_size <argument>size</argument></syntax>
+<default>variables_hash_bucket_size 64</default>
+<context>http</context>
+
+<para>
+Sets the bucket size for the variables hash table.
+For more information, please refer to
+<link doc="../hash.xml">Setting Up Hashes</link>.
+</para>
+
+</directive>
+
+
+<directive name="variables_hash_max_size">
+<syntax>variables_hash_max_size <argument>size</argument></syntax>
+<default>variables_hash_max_size 512</default>
+<context>http</context>
+
+<para>
+Sets the maximum <argument>size</argument> of the variables hash table.
+For more information, please refer to
+<link doc="../hash.xml">Setting Up Hashes</link>.
+</para>
+
+</directive>
+
 </section>
 
 <section id="variables" name="Embedded Variables">