-The module ngx_http_empty_gif_module emits +The ngx_http_empty_gif_module module emits single-pixel transparent GIF. diff -r fadccc156188 -r 95c3c3bbf1ce xml/en/docs/http/ngx_http_fastcgi_module.xml --- a/xml/en/docs/http/ngx_http_fastcgi_module.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/en/docs/http/ngx_http_fastcgi_module.xml Wed Aug 14 12:03:41 2013 +0400 @@ -15,7 +15,7 @@

-The ngx_http_fastcgi_module module allows to pass +The ngx_http_fastcgi_module module allows passing requests to a FastCGI server. @@ -53,13 +53,13 @@ 0.8.22 -Forces outgoing connections to a FastCGI server to originate +Makes outgoing connections to a FastCGI server originate from the specified local IP address. -Value of the parameter can contain variables (1.3.12). +Parameter value can contain variables (1.3.12). The special value off (1.3.12) cancels the effect of the fastcgi_bind directive -inherited from the previous configuration level, allowing the -system to auto-assign local address. +inherited from the previous configuration level, which allows the +system to auto-assign the local IP address. @@ -73,7 +73,7 @@ location -Sets size of the buffer used for reading the first part +Sets the size of the buffer used for reading the first part of a response received from the FastCGI server. This part usually contains a small response header. By default, the buffer size is equal to the size of one @@ -115,7 +115,7 @@ yet fully read. In the mean time, the rest of the buffers can be used for reading a response and, if needed, buffering part of a response to a temporary file. -By default, size is limited by two buffers set by the +By default, size is limited by the size of two buffers set by the and directives. @@ -190,7 +190,7 @@ a new cache element identified according to the directive by passing a request to a FastCGI server. Other requests of the same cache element will either wait -for a response to appear in the cache, or the cache lock for +for a response to appear in the cache or the cache lock for this element to be released, up to the time set by the directive. @@ -265,7 +265,7 @@ http -Sets path and other parameters of a cache. +Sets the path and other parameters of a cache. Cache data are stored in files. Both the key and file name in a cache are a result of applying the MD5 function to the proxied URL. @@ -282,12 +282,14 @@ -A cached response is first written to a temporary file, then a file is renamed. -Starting from version 0.8.9 temporary files and the cache can be put on -different file systems but be aware that in this case a file is copied -across two file systems instead of the cheap rename operation. +A cached response is first written to a temporary file, +and then the file is renamed. +Starting from version 0.8.9, temporary files and the cache can be put on +different file systems. +However, be aware that in this case a file is copied +across two file systems instead of the cheap renaming operation. It is thus recommended that for any given location both cache and a directory -holding temporary files set by the directive +holding temporary files, set by the directive, are put on the same file system. @@ -302,22 +304,22 @@ -The special process “cache manager” monitors the maximum cache size set -by the max_size parameter; -when this size is exceeded it removes the least recently used data. +The special “cache manager” process monitors the maximum cache size set +by the max_size parameter. +When this size is exceeded, it removes the least recently used data. -A minute after the start the special process “cache loader” is activated -that loads information about previously cached data stored on file system +A minute after the start the special “cache loader” process is activated. +It loads information about previously cached data stored on file system into a cache zone. -A load is done in iterations. +The loading is done in iterations. During one iteration no more than loader_files items are loaded (by default, 100). Besides, the duration of one iteration is limited by the loader_threshold parameter (by default, 200 milliseconds). -A pause is made between iterations, configured by the -loader_sleep parameter (by default, 50 milliseconds). +Between iterations, a pause configured by the loader_sleep +parameter (by default, 50 milliseconds) is made. @@ -341,17 +343,16 @@ location -If an error occurs while working with the FastCGI server it is possible -to use a stale cached response. -This directives determines in which cases it is permitted. -The directive’s parameters match those of the +Determines in which cases a stale cached response can be used +when an error occurs during communication with the FastCGI server. +The directive’s parameters match the parameters of the directive. Additionally, the updating parameter permits -to use a stale cached response if it is currently being updated. -This allows to minimize the number of accesses to FastCGI servers +using a stale cached response if it is currently being updated. +This allows minimizing the number of accesses to FastCGI servers when updating cached data. @@ -378,7 +379,7 @@ fastcgi_cache_valid 200 302 10m; fastcgi_cache_valid 404 1m; -set 10 minutes of caching for responses with codes 200 and 302, +set 10 minutes of caching for responses with codes 200 and 302 and 1 minute for responses with code 404. @@ -391,8 +392,8 @@ -In addition, it can be specified to cache any responses using the -any parameter: +In addition, the any parameter can be specified +to cache any responses: fastcgi_cache_valid 200 302 10m; fastcgi_cache_valid 301 1h; @@ -403,11 +404,11 @@ Parameters of caching can also be set directly in the response header. -This has a higher precedence than setting of caching time using the directive. +This has higher priority than setting of caching time using the directive. The

X-Accel-Expires

header field sets caching time of a response in seconds. -The value 0 disables to cache a response. -If a value starts with the prefix @, it sets an absolute +The zero value disables caching for a response. +If a value starts with the @ prefix, it sets an absolute time in seconds since Epoch, up to which the response may be cached. If header does not include the

X-Accel-Expires

field, parameters of caching may be set in the header fields @@ -432,8 +433,8 @@ Sets a string to search for in the error stream of a response received from a FastCGI server. If the string is found then it is considered that the FastCGI -server returned an invalid response. -This allows to handle application errors in nginx, for example: +server has returned an invalid response. +This allows handling application errors in nginx, for example: location /php { fastcgi_pass backend:9000; @@ -455,7 +456,7 @@ location -Defines a timeout for establishing a connection with the FastCGI server. +Defines a timeout for establishing a connection with a FastCGI server. It should be noted that this timeout cannot usually exceed 75 seconds. @@ -472,7 +473,7 @@ By default, nginx does not pass the header fields

Status

and -

X-Accel-...

from the response of the FastCGI +

X-Accel-...

from the response of a FastCGI server to a client. The fastcgi_hide_header directive sets additional fields that will not be passed. @@ -491,8 +492,8 @@ location -Determines should the connection with the FastCGI server be -closed if a client closes a connection without waiting +Determines whether the connection with a FastCGI server should be +closed when a client closes a connection without waiting for a response. @@ -516,13 +517,14 @@ -If not disabled, processing of these header fields has the following effect: +If not disabled, processing of these header fields has the following +effect:

X-Accel-Expires

Expires

Cache-Control

, and

Set-Cookie

-set parameters of response caching; +set the parameters of response caching; @@ -532,7 +534,7 @@ -

X-Accel-Limit-Rate

sets a +

X-Accel-Limit-Rate

sets the rate limit for transmission of a response to a client; @@ -589,7 +591,7 @@ Determines whether FastCGI server responses with codes greater than or equal to 300 should be passed to a client or be redirected to nginx for processing -using the directive. +with the directive. @@ -606,9 +608,9 @@ By default, a FastCGI server will close a connection right after sending the response. -When set to the value on, nginx will instruct -a FastCGI server to keep connections open. -This in particular is necessary for +However, when this directive is set to the value on, +nginx will instruct a FastCGI server to keep connections open. +This is necessary, in particular, for connections to FastCGI servers to function. @@ -624,16 +626,16 @@ location -When the whole response does not fit into memory buffers +When the whole response does not fit into the memory buffers set by the and -directives, part of a response can be saved to a temporary file. +directives, a part of the response can be saved to a temporary file. This directive sets the maximum size of a temporary file. The size of data written to a temporary file at a time is set by the directive. -Value of zero disables buffering of responses to temporary files. +The zero value disables buffering of responses to temporary files. @@ -661,14 +663,14 @@ error an error occurred while establishing a connection with the -server, passing it a request, or reading the response header; +server, passing a request to it, or reading the response header; timeout a timeout has occurred while establishing a connection with the -server, passing it a request, or reading the response header; +server, passing a request to it, or reading the response header; invalid_header -a server returned empty or invalid response; +a server returned an empty or invalid response;

http_500

a server returned a response with the code 500; @@ -689,10 +691,10 @@ -It should be understood that passing a request to the next server is -only possible if a client was not sent anything yet. -That is, if an error or a timeout occurs in the middle of -transferring a response, fixing this is impossible. +One should bear in mind that passing a request to the next server is +only possible if nothing has been sent to a client yet. +That is, if an error or timeout occurs in the middle of the +transferring of a response, fixing this is impossible. @@ -801,9 +803,9 @@ if in location -Sets an address of the FastCGI server. -An address can be specified as a domain name or an address, and a port, -for example, +Sets the address of a FastCGI server. +The address can be specified as a domain name or IP address, +and an optional port: fastcgi_pass localhost:9000; @@ -831,8 +833,8 @@ location -Permits to pass otherwise disabled header -fields from the FastCGI server to a client. +Permits passing otherwise disabled header +fields from a FastCGI server to a client. @@ -847,7 +849,7 @@ Defines a timeout for reading a response from the FastCGI server. -A timeout is only set between two successive read operations, +A timeout is set only between two successive read operations, not for the transmission of the whole response. If a FastCGI server does not transmit anything within this time, a connection is closed. @@ -864,7 +866,7 @@ location -If disabled, the original request body will not be passed +Indicates whether the original request body is passed to the FastCGI server. See also the directive. @@ -880,8 +882,8 @@ location -If disabled, header fields of the original request will not be passed to the -FastCGI server. +Indicates whether the header fields of the original request are passed +to the FastCGI server. See also the directive. @@ -896,7 +898,8 @@ location -If set to a non-zero value, nginx will try to minimize the number +If the directive is set to a non-zero value, nginx will try to +minimize the number of send operations on outgoing connections to a FastCGI server by using either NOTE_LOWAT flag of the method, @@ -920,7 +923,7 @@ Sets a timeout for transmitting a request to the FastCGI server. -A timeout is only set between two successive write operations, +A timeout is set only between two successive write operations, not for the transmission of the whole request. If a FastCGI server does not receive anything within this time, a connection is closed. @@ -937,7 +940,7 @@ Defines a regular expression that captures a value for the $fastcgi_path_info variable. -A regular expression should have two captures, the first becomes +A regular expression should have two captures: the first becomes a value of the $fastcgi_script_name variable, the second becomes a value of the $fastcgi_path_info variable. For example, with these settings @@ -984,13 +987,14 @@ The modification time of files is set according to the received

Last-Modified

response header field. -A response is first written to a temporary file, then a file is renamed. -Starting from version 0.8.9 temporary files and the persistent store -can be put on different file systems but be aware that in this case -a file is copied across two file systems instead of the cheap rename operation. +A response is first written to a temporary file, and then the file is renamed. +Starting from version 0.8.9, temporary files and the persistent store +can be put on different file systems. +However, be aware that in this case a file is copied +across two file systems instead of the cheap renaming operation. It is thus recommended that for any given location both saved files and a -directory holding temporary files set by the -directive are put on the same file system. +directory holding temporary files, set by the +directive, are put on the same file system. @@ -1105,7 +1109,7 @@ these parameters are usually made available as environment variables. For example, the

User-Agent

header field is passed as the HTTP_USER_AGENT parameter. -In addition to HTTP request header fields it is possible to pass arbitrary +In addition to HTTP request header fields, it is possible to pass arbitrary parameters using the directive. @@ -1138,7 +1142,7 @@ When using the directive, -the $fastcgi_script_name variable equals to the value of +the $fastcgi_script_name variable equals the value of the first capture set by the directive. diff -r fadccc156188 -r 95c3c3bbf1ce xml/en/docs/http/ngx_http_flv_module.xml --- a/xml/en/docs/http/ngx_http_flv_module.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/en/docs/http/ngx_http_flv_module.xml Wed Aug 14 12:03:41 2013 +0400 @@ -15,15 +15,15 @@

-The module ngx_http_flv_module provides pseudo-streaming +The ngx_http_flv_module module provides pseudo-streaming server-side support for Flash Video (FLV) files. It handles requests with the start argument in the request URI’s query string specially, by sending back the contents -of a file starting from the requested byte offset, and with the FLV -header prepended. +of a file starting from the requested byte offset and with the prepended FLV +header. diff -r fadccc156188 -r 95c3c3bbf1ce xml/en/docs/http/ngx_http_geo_module.xml --- a/xml/en/docs/http/ngx_http_geo_module.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/en/docs/http/ngx_http_geo_module.xml Wed Aug 14 12:03:41 2013 +0400 @@ -16,7 +16,7 @@ The ngx_http_geo_module module creates variables -whose values depend on the client IP address. +with values depending on the client IP address.

@@ -52,7 +52,7 @@ Describes the dependency of values of the specified variable on the client IP address. -By default an address is taken from the $remote_addr variable +By default, the address is taken from the $remote_addr variable, but it can also be taken from another variable (0.7.27), for example: geo $arg_remote_addr $geo { @@ -65,7 +65,7 @@ Since variables are evaluated only when used, the mere existence of even a large number of declared “geo” variables -does not incur any extra costs for request processing. +does not cause any extra costs for request processing. @@ -93,7 +93,7 @@ default

-a value of variable if the client address does not +a value set to the variable if the client address does not match any of the specified addresses. When addresses are specified in CIDR notation, “0.0.0.0/0” and “::/0” @@ -124,10 +124,10 @@ proxy_recursive enables recursive address search (1.3.0, 1.2.1). -If recursive search is disabled then instead of an original client +If recursive search is disabled then instead of the original client address that matches one of the trusted addresses, the last address sent in

X-Forwarded-For

will be used. -If recursive search is enabled then instead an original client +If recursive search is enabled then instead of the original client address that matches one of the trusted addresses, the last non-trusted address sent in

X-Forwarded-For

will be used. @@ -136,7 +136,7 @@ indicates that addresses are specified as ranges (0.7.23). This parameter should be the first. -To speed up loading of a geo base, addresses should be put in increasing order. +To speed up loading of a geo base, addresses should be put in ascending order. diff -r fadccc156188 -r 95c3c3bbf1ce xml/en/docs/http/ngx_http_geoip_module.xml --- a/xml/en/docs/http/ngx_http_geoip_module.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/en/docs/http/ngx_http_geoip_module.xml Wed Aug 14 12:03:41 2013 +0400 @@ -16,12 +16,12 @@ The ngx_http_geoip_module module (0.8.6+) creates variables -whose values depend on the client IP address, using the precompiled +with values depending on the client IP address, using the precompiled MaxMind databases. -When using IPv6 databases (1.3.12, 1.2.7), +When using the databases with IPv6 support (1.3.12, 1.2.7), IPv4 addresses are looked up as IPv4-mapped IPv6 addresses. @@ -63,7 +63,7 @@ http -Specifies a database used to determine a country +Specifies a database used to determine the country depending on the client IP address. The following variables are available when using this database: @@ -98,7 +98,7 @@ http -Specifies a database used to determine a country, region, and city +Specifies a database used to determine the country, region, and city depending on the client IP address. The following variables are available when using this database: @@ -185,7 +185,7 @@ 1.0.3 -Specifies a database used to determine an organization +Specifies a database used to determine the organization depending on the client IP address. The following variable is available when using this database: @@ -226,10 +226,10 @@ 1.2.1 -If recursive search is disabled then instead of an original client +If recursive search is disabled then instead of the original client address that matches one of the trusted addresses, the last address sent in

X-Forwarded-For

will be used. diff -r fadccc156188 -r 95c3c3bbf1ce xml/en/docs/http/ngx_http_gunzip_module.xml --- a/xml/en/docs/http/ngx_http_gunzip_module.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/en/docs/http/ngx_http_gunzip_module.xml Wed Aug 14 12:03:41 2013 +0400 @@ -19,7 +19,7 @@ decompresses responses with “Content-Encoding: gzip” for clients that do not support “gzip” encoding method. The module will be useful when it is desirable to store -data compressed, to save space and reduce I/O costs. +data compressed to save space and reduce I/O costs. diff -r fadccc156188 -r 95c3c3bbf1ce xml/en/docs/http/ngx_http_gzip_module.xml --- a/xml/en/docs/http/ngx_http_gzip_module.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/en/docs/http/ngx_http_gzip_module.xml Wed Aug 14 12:03:41 2013 +0400 @@ -17,7 +17,7 @@ The ngx_http_gzip_module module is a filter that compresses responses using the “gzip” method. -This often allows to reduce the size of transmitted data by half or even more. +This often helps to reduce the size of transmitted data by half or even more.

@@ -89,7 +89,7 @@ Sets a gzip compression level of a response. -Acceptable values are in the 1..9 range. +Acceptable values are in the range from 1 to 9. @@ -111,7 +111,7 @@ The special mask “msie6” (0.7.12) corresponds to -the regular expression “MSIE [4-6]\.” but works faster. +the regular expression “MSIE [4-6]\.”, but works faster. Starting from version 0.8.11, “MSIE 6.0; ... SV1” is excluded from this mask. @@ -169,7 +169,7 @@ Enables or disables gzipping of responses for proxied requests depending on the request and response. -The fact that the response is proxied is determined based on +The fact that the response is proxied is determined by the presence of the

Via

request header field. A directive accepts multiple parameters: @@ -182,45 +182,47 @@ expired

-enables compression if a response header includes the field -

Expires

with a value that disables caching; +enables compression if a response header includes the +

Expires

field with a value that disables caching;

no-cache

-enables compression if a response header includes the field -

Cache-Control

with the parameter “no-cache”; +enables compression if a response header includes the +

Cache-Control

field with the +“no-cache” parameter;

no-store

-enables compression if a response header includes the field -

Cache-Control

with the parameter -“no-store”; +enables compression if a response header includes the +

Cache-Control

field with the +“no-store” parameter;

private

-enables compression if a response header includes the field -

Cache-Control

with the parameter “private”; +enables compression if a response header includes the +

Cache-Control

field with the +“private” parameter;

no_last_modified

-enables compression if a response header does not include the field -

Last-Modified

; +enables compression if a response header does not include the +

Last-Modified

field;

no_etag

-enables compression if a response header does not include the field -

ETag

; +enables compression if a response header does not include the +

ETag

field;

auth

-enables compression if a request header includes the field -

Authorization

; +enables compression if a request header includes the +

Authorization

field;

any @@ -245,7 +247,7 @@ Enables gzipping of responses for the specified MIME types in addition to “text/html”. The special value “*” matches any MIME type (0.8.29). -Responses with the type “text/html” are always compressed. +Responses with the “text/html” type are always compressed. @@ -259,7 +261,7 @@ location -Enables or disables emitting the

Vary: Accept-Encoding

+Enables or disables inserting the

Vary: Accept-Encoding

response header field if the directives , , or @@ -279,7 +281,7 @@ $gzip_ratio achieved compression ratio, computed as the ratio between the -original and compressed response size. +original and compressed response sizes. diff -r fadccc156188 -r 95c3c3bbf1ce xml/en/docs/http/ngx_http_gzip_static_module.xml --- a/xml/en/docs/http/ngx_http_gzip_static_module.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/en/docs/http/ngx_http_gzip_static_module.xml Wed Aug 14 12:03:41 2013 +0400 @@ -16,7 +16,7 @@ The ngx_http_gzip_static_module module allows -to send precompressed files with the “.gz” +sending precompressed files with the “.gz” filename extension instead of regular files. @@ -73,7 +73,7 @@ The files can be compressed using the gzip command, -or any other compatible. +or any other compatible one. It is recommended that the modification date and time of original and compressed files be the same. diff -r fadccc156188 -r 95c3c3bbf1ce xml/en/docs/http/ngx_http_headers_module.xml --- a/xml/en/docs/http/ngx_http_headers_module.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/en/docs/http/ngx_http_headers_module.xml Wed Aug 14 12:03:41 2013 +0400 @@ -15,9 +15,9 @@

-The ngx_http_headers_module module allows to emit +The ngx_http_headers_module module allows adding the

Expires

and

Cache-Control

header -fields, and to add arbitrary fields to a response header. +fields, and arbitrary fields, to a response header.

diff -r fadccc156188 -r 95c3c3bbf1ce xml/en/docs/http/ngx_http_image_filter_module.xml --- a/xml/en/docs/http/ngx_http_image_filter_module.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/en/docs/http/ngx_http_image_filter_module.xml Wed Aug 14 12:03:41 2013 +0400 @@ -26,8 +26,7 @@ This module utilizes the libgd library. -It is recommended to use the latest available version of the library; -it is version 2.0.35 as of this writing. +It is recommended to use the latest available version of the library. @@ -87,9 +86,9 @@ test

ensures that responses are images in either JPEG, GIF, or PNG format. -Otherwise, the error +Otherwise, the -is returned. +error is returned.

size @@ -98,7 +97,7 @@ { "img" : { "width": 100, "height": 100, "type": "gif" } } -In case of an error, the following is output: +In case of an error, the output is as follows: {} @@ -109,8 +108,8 @@ rotates images counter-clockwise by the specified number of degrees. -Value of the parameter can contain variables. -Can be used either alone, or along with the +Parameter value can contain variables. +This mode can be used either alone or along with the resize and crop transformations. @@ -124,7 +123,7 @@ “-”. In case of an error, the server will return code . -Values of parameters can contain variables. +Parameter values can contain variables. When used along with the rotate parameter, the rotation happens after reduction. @@ -134,13 +133,13 @@ height -proportionally reduces an image to the size of the largest side +proportionally reduces an image to the larger side size and crops extraneous edges by another side. To reduce by only one dimension, another dimension can be specified as “-”. In case of an error, the server will return code . -Values of parameters can contain variables. +Parameter values can contain variables. When used along with the rotate parameter, the rotation happens before reduction. @@ -160,7 +159,7 @@ Sets the maximum size of the buffer used for reading images. -When a size is exceeded the server will return error +When the size is exceeded the server returns error . @@ -192,10 +191,10 @@ Sets the desired quality of the transformed JPEG images. -Acceptable values are in the 1..100 range. +Acceptable values are in the range from 1 to 100. Lesser values usually imply both lower image quality and less data to transfer. The maximum recommended value is 95. -Value of the parameter can contain variables. +Parameter value can contain variables. @@ -211,8 +210,8 @@ Increases sharpness of the final image. The sharpness percentage can exceed 100. -The value of 0 disables sharpening. -Value of the parameter can contain variables. +The zero value disables sharpening. +Parameter value can contain variables. @@ -227,8 +226,8 @@ Defines whether transparency should be preserved when transforming -PNG images with colors specified by a palette, or in GIF images. -The loss of transparency allows to obtain images of a better quality. +GIF images or PNG images with colors specified by a palette. +The loss of transparency results in images of a better quality. The alpha channel transparency in PNG is always preserved. diff -r fadccc156188 -r 95c3c3bbf1ce xml/en/docs/http/ngx_http_index_module.xml --- a/xml/en/docs/http/ngx_http_index_module.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/en/docs/http/ngx_http_index_module.xml Wed Aug 14 12:03:41 2013 +0400 @@ -15,9 +15,9 @@

-The module ngx_http_index_module processes requests +The ngx_http_index_module module processes requests ending with the slash character (‘/’). -Such requests can also be processed by +Such requests can also be processed by the ngx_http_autoindex_module and ngx_http_random_index_module @@ -61,8 +61,8 @@ -It should be noted that when using an index file, an internal redirect -is made, and request can be processed in a different location. +It should be noted that using an index file causes an internal redirect, +and the request can be processed in a different location. For example, with the following configuration: location = / { @@ -73,7 +73,7 @@ ... } -a request of “/” will actually be processed in the +a “/” request will actually be processed in the second location as “/index.html”. diff -r fadccc156188 -r 95c3c3bbf1ce xml/en/docs/http/ngx_http_limit_conn_module.xml --- a/xml/en/docs/http/ngx_http_limit_conn_module.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/en/docs/http/ngx_http_limit_conn_module.xml Wed Aug 14 12:03:41 2013 +0400 @@ -15,15 +15,15 @@

-The ngx_http_limit_conn_module module allows -to limit the number of connections per defined key, in +The ngx_http_limit_conn_module module is used to +limit the number of connections per the defined key, in particular, the number of connections from a single IP address. -Not all connections are counted; only those that have requests -currently being processed by the server, in which request header has -been fully read. +Not all connections are counted. +A connection is counted only if it has a request processed by the server +and the whole request header has already been read.

@@ -61,11 +61,11 @@ location -Sets a shared memory zone +Sets the shared memory zone and the maximum allowed number of connections for a given key value. -When this limit is exceeded, the server will return error +When this limit is exceeded, the server will return the -in reply to a request. +error in reply to a request. For example, the directives limit_conn_zone $binary_remote_addr zone=addr:10m; @@ -75,15 +75,15 @@ limit_conn addr 1; } -allow for only a single connection at a time, per unique IP address. +allow only one connection per an IP address at a time. When several limit_conn directives are specified, any configured limit will apply. For example, the following configuration will limit the number -of connections to the server per client IP and at the same time -will limit the total number of connections to the virtual host: +of connections to the server per a client IP and, at the same time, +the total number of connections to the virtual host: limit_conn_zone $binary_remote_addr zone=perip:10m; limit_conn_zone $server_name zone=perserver:10m; @@ -136,7 +136,7 @@ 1.3.15 -Sets status code to be used when requests are rejected. +Sets the status code to return in response to rejected requests. @@ -150,30 +150,32 @@ http -Sets parameters of a shared memory zone that keeps states -for various keys. -This state stores the current number of connections in particular. +Sets parameters for a shared memory zone +that will keep states for various keys. +In particular, the state includes the current number of connections. The key is any non-empty value of the specified variable (empty values are not accounted). -Example usage: +Usage example: limit_conn_zone $binary_remote_addr zone=addr:10m; -Here, an IP address of the client serves as a key. +Here, a client IP address serves as a key. Note that instead of $remote_addr, the $binary_remote_addr variable is used here. -The length of the $remote_addr variable’s value can -range from 7 to 15 bytes, and the stored state occupies either -32 or 64 bytes of memory on 32-bit platforms, and always 64 +The $remote_addr variable’s size can +vary from 7 to 15 bytes. +The stored state occupies either +32 or 64 bytes of memory on 32-bit platforms and always 64 bytes on 64-bit platforms. -The length of the $binary_remote_addr variable’s value -is always 4 bytes, and the stored state always occupies 32 bytes -on 32-bit platforms, and 64 bytes on 64-bit platforms. -One megabyte zone can keep about 32 thousand 32-byte states, -and about 16 thousand 64-byte states. -If the storage for a zone is exhausted, the server will return error +The $binary_remote_addr variable’s size +is always 4 bytes. +The stored state always occupies 32 bytes +on 32-bit platforms and 64 bytes on 64-bit platforms. +One megabyte zone can keep about 32 thousand 32-byte states +or about 16 thousand 64-byte states. +If the zone storage is exhausted, the server will return the -to all further requests. +error to all further requests. diff -r fadccc156188 -r 95c3c3bbf1ce xml/en/docs/http/ngx_http_limit_req_module.xml --- a/xml/en/docs/http/ngx_http_limit_req_module.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/en/docs/http/ngx_http_limit_req_module.xml Wed Aug 14 12:03:41 2013 +0400 @@ -15,8 +15,8 @@

-The ngx_http_limit_req_module module (0.7.21) allows -to limit the request processing rate per defined key, +The ngx_http_limit_req_module module (0.7.21) is used +to limit the request processing rate per a defined key, in particular, the processing rate of requests coming from a single IP address. The limitation is done using the “leaky bucket” method. @@ -60,9 +60,9 @@ location -Sets a shared memory zone +Sets the shared memory zone and the maximum burst size of requests. -If the rate of requests exceeds the rate configured for a zone, +If the requests rate exceeds the rate configured for a zone, their processing is delayed such that requests are processed at a defined rate. Excessive requests are delayed until their number exceeds the @@ -109,9 +109,9 @@ Sets the desired logging level for cases when the server refuses to process requests -due to rate being exceeded, +due to rate exceeding, or delays request processing. -Delays are logged with the level one less than refusals; for example, +Logging level for delays is one point less than for refusals; for example, if “limit_req_log_level notice” is specified, delays are logged with the info level. @@ -128,7 +128,7 @@ 1.3.15 -Sets status code to be used when requests are rejected. +Sets the status code to return in response to rejected requests. @@ -143,12 +143,12 @@ http -Sets parameters of a shared memory zone -that keeps states for various keys. -The state stores the current number of excessive requests in particular. +Sets parameters for a shared memory zone +that will keep states for various keys. +In particular, the state stores the current number of excessive requests. The key is any non-empty value of the specified variable (empty values are not accounted). -Example usage: +Usage example: limit_req_zone $binary_remote_addr zone=one:10m rate=1r/s; @@ -161,14 +161,14 @@ -An IP address of the client serves as a key. +A client IP address serves as a key. Note that instead of $remote_addr, the $binary_remote_addr variable is used here, -allowing to lower the size of a state down to 64 bytes. +that allows to decrease the state size down to 64 bytes. One megabyte zone can keep about 16 thousand 64-byte states. -If the storage for a zone is exhausted, the server will return error +If the zone storage is exhausted, the server will return the -to all further requests. +error to all further requests. diff -r fadccc156188 -r 95c3c3bbf1ce xml/en/docs/http/ngx_http_log_module.xml --- a/xml/en/docs/http/ngx_http_log_module.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/en/docs/http/ngx_http_log_module.xml Wed Aug 14 12:03:41 2013 +0400 @@ -20,8 +20,8 @@ -Requests are logged in a context of a location where processing ends. -This may be different from the original location, if an +Requests are logged in the context of a location where processing ends. +It may be different from the original location, if an internal redirect happens during request processing. @@ -70,14 +70,14 @@ limit_except -Sets the path, format, and configuration of the buffered log writes. +Sets the path, format, and configuration for a buffered log write. Several logs can be specified on the same level. Logging to syslog can be configured by specifying the “syslog:” prefix in the first parameter. The special value off cancels all access_log directives on the current level. -If format is not specified then the predefined format -“combined” is used. +If the format is not specified then the predefined +“combined” format is used. @@ -85,7 +85,7 @@ (1.3.10, 1.2.7) parameter is used, writes to log will be buffered. -The buffer size must not exceed the size of the atomic write to a disk file. +The buffer size must not exceed the size of an atomic write to a disk file. For FreeBSD this size is unlimited. @@ -116,7 +116,7 @@ be compressed before writing to the file. The compression level can be set between 1 (fastest, less compression) and 9 (slowest, best compression). -By default the buffer size is equal to 64K bytes, and the compression level +By default, the buffer size is equal to 64K bytes, and the compression level is set to 1. Since the data is compressed in atomic blocks, the log file can be decompressed or read by “zcat” at any time. @@ -152,12 +152,11 @@ -a file is opened and closed for each log write. +the file is opened and closed for each log write. However, since the descriptors of frequently used files can be stored -in a cache, writes during the -time specified by the valid parameter of the - directive can continue to be made -to the old file. +in a cache, writing to the old file +can continue during the time specified by the +directive’s valid parameter @@ -260,7 +259,7 @@ http -Specifies format of a log. +Specifies log format. @@ -285,7 +284,7 @@ $msec

-time in seconds with a milliseconds resolution at the time of log write +time in seconds with a milliseconds resolution at the time of the log write

$pipe @@ -324,7 +323,7 @@ -In modern versions of nginx variables +In the modern nginx versions variables $status (1.3.2, 1.2.2), $bytes_sent @@ -358,8 +357,8 @@ -The configuration always includes the predefined format -“combined”: +The configuration always includes the predefined +“combined” format: log_format combined '$remote_addr - $remote_user [$time_local] ' '"$request" $status $body_bytes_sent ' @@ -384,36 +383,36 @@ location -Defines a cache that stores file descriptors of frequently used logs +Defines a cache that stores the file descriptors of frequently used logs whose names contain variables. The directive has the following parameters:

max

-sets a maximum number of descriptors in a cache; -if cache becomes full the least recently used (LRU) +sets the maximum number of descriptors in a cache; +if the cache becomes full the least recently used (LRU) descriptors are closed

inactive

-sets a time after which the cached descriptor is closed +sets the time after which the cached descriptor is closed if there were no access during this time; by default, 10 seconds

min_uses

-sets a minimum number of file uses during the time +sets the minimum number of file uses during the time defined by the inactive parameter -after which the descriptor will stay open in a cache; +to let the descriptor stay open in a cache; by default, 1

valid

-sets a time after which it should be checked that the file +sets the time after which it should be checked that the file still exists with the same name; by default, 60 seconds @@ -426,7 +425,7 @@ -Example usage: +Usage example: open_log_file_cache max=1000 inactive=20s valid=1m min_uses=2; diff -r fadccc156188 -r 95c3c3bbf1ce xml/en/docs/http/ngx_http_map_module.xml --- a/xml/en/docs/http/ngx_http_map_module.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/en/docs/http/ngx_http_map_module.xml Wed Aug 14 12:03:41 2013 +0400 @@ -70,9 +70,9 @@ -Since variables are evaluated only when used, the mere existence -of even a large number of declared “map” variables -does not incur any extra costs for request processing. +Since variables are evaluated only when they are used, the mere declaration +even of a large number of “map” variables +does not add any extra costs to request processing. @@ -117,8 +117,7 @@ hostnames

-allows to specify hostnames with a prefix or suffix mask, as source -values, for example, +indicates that source values can be hostnames with a prefix or suffix mask: *.example.com 1; example.* 1; @@ -146,8 +145,8 @@ If the source value matches more than one of the specified variants, -e.g. both mask and regular expression match, the first matching -variant will be chosen, in the following order of precedence: +e.g. both a mask and a regular expression match, the first matching +variant will be chosen, in the following order of priority: @@ -186,8 +185,8 @@ Sets the bucket size for the variables hash tables. -Default value depends on the size of the processor’s cache line. -Details of setting up hash tables are provided in a separate +Default value depends on the processor’s cache line size. +The details of setting up hash tables are provided in a separate document. @@ -202,7 +201,7 @@ Sets the maximum size of the variables hash tables. -Details of setting up hash tables are provided in a separate +The details of setting up hash tables are provided in a separate document. diff -r fadccc156188 -r 95c3c3bbf1ce xml/en/docs/http/ngx_http_memcached_module.xml --- a/xml/en/docs/http/ngx_http_memcached_module.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/en/docs/http/ngx_http_memcached_module.xml Wed Aug 14 12:03:41 2013 +0400 @@ -15,10 +15,10 @@

-The ngx_http_memcached_module module allows to obtain +The ngx_http_memcached_module module is used to obtain responses from a memcached server. The key is set in the $memcached_key variable. -A response should be put in memcached in advance via means that are +A response should be put in memcached in advance by means external to nginx. @@ -57,13 +57,13 @@ 0.8.22 -Forces outgoing connections to a memcached server to originate +Makes outgoing connections to a memcached server originate from the specified local IP address. -Value of the parameter can contain variables (1.3.12). +Parameter value can contain variables (1.3.12). The special value off (1.3.12) cancels the effect of the memcached_bind directive -inherited from the previous configuration level, allowing the -system to auto-assign local address. +inherited from the previous configuration level, which allows the +system to auto-assign the local IP address. @@ -77,9 +77,9 @@ location -Sets size of the buffer used for reading a response +Sets the size of the buffer used for reading a response received from the memcached server. -A response is passed to a client synchronously, immediately as it is received. +A response is passed to a client synchronously, as soon as it is received. @@ -93,7 +93,7 @@ location -Defines a timeout for establishing a connection with the memcached server. +Defines a timeout for establishing a connection with a memcached server. It should be noted that this timeout cannot usually exceed 75 seconds. @@ -110,8 +110,8 @@ Enables the test for the flag presence in the memcached -server response and sets the response header field -“Content-Encoding” to “gzip” +server response and sets the “Content-Encoding” +response header field to “gzip” if the flag is set. @@ -137,14 +137,14 @@ error an error occurred while establishing a connection with the -server, passing it a request, or reading the response header; +server, passing a request to it, or reading the response header; timeout a timeout has occurred while establishing a connection with the -server, passing it a request, or reading the response header; +server, passing a request to it, or reading the response header; invalid_response -a server returned empty or invalid response; +a server returned an empty or invalid response;

not_found

a response was not found on the server; @@ -156,10 +156,10 @@ -It should be understood that passing a request to the next server is -only possible if a client was not sent anything yet. -That is, if an error or a timeout occurs in the middle of -transferring a response, fixing this is impossible. +One should bear in mind that passing a request to the next server is +only possible if nothing has been sent to a client yet. +That is, if an error or timeout occurs in the middle of the +transferring of a response, fixing this is impossible. @@ -183,9 +183,8 @@ if in location -Sets an address of the memcached server. -An address can be specified as a domain name or an address, and a port, -for example, +Sets the memcached server address. +The address can be specified as a domain name or an address, and a port: memcached_pass localhost:11211; @@ -214,10 +213,10 @@ Defines a timeout for reading a response from the memcached server. -A timeout is only set between two successive read operations, +A timeout is set only between two successive read operations, not for the transmission of the whole response. If a memcached server does not transmit anything within this time, -a connection is closed. +the connection is closed. @@ -232,7 +231,7 @@ Sets a timeout for transmitting a request to the memcached server. -A timeout is only set between two successive write operations, +A timeout is set only between two successive write operations, not for the transmission of the whole request. If a memcached server does not receive anything within this time, a connection is closed. diff -r fadccc156188 -r 95c3c3bbf1ce xml/en/docs/http/ngx_http_mp4_module.xml --- a/xml/en/docs/http/ngx_http_mp4_module.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/en/docs/http/ngx_http_mp4_module.xml Wed Aug 14 12:03:41 2013 +0400 @@ -14,24 +14,25 @@

-The module ngx_http_mp4_module provides pseudo-streaming -server-side support for H.264/AAC files typically having filename extensions -.mp4, .m4v, and .m4a. +The ngx_http_mp4_module module provides pseudo-streaming +server-side support for H.264/AAC files. +Such files typically have the .mp4, .m4v, +or .m4a filename extensions. -Pseudo-streaming works in alliance with conforming Flash players. +The pseudo-streaming works in alliance with a compatible Flash players. A player sends an HTTP request to the server with a start time -argument in the request URI’s query string (named simply +specified in the query string argument (named simply start -and specified in seconds), and the server responds with a stream -so that its start position corresponds to the requested time, +and specified in seconds), and the server responds with the stream +such that its start position corresponds to the requested time, for example: http://example.com/elephants_dream.mp4?start=238.88 -This allows for a random seeking at any time, or starting playback -in the middle of a timeline. +This allows performing a random seeking at any time, or starting playback +in the middle of the timeline. @@ -45,14 +46,14 @@ To start playback, a player first needs to read metadata. This is done by sending a special request with the start=0 -argument. Many encoding software will insert the metadata at +argument. Much of encoding software will insert the metadata at the end of the file. This is bad for pseudo-streaming: -the metadata needs to be located at the beginning of the file, -or else the entire file will have to be downloaded before it -starts playing. If a file is well-formed (with metadata at the -beginning of a file), nginx just sends back the contents of a file. +the metadata should be located at the beginning of the file, +or else the entire file will have to be downloaded to +start playing. If a file is well-formed (with metadata at the +beginning of a file), nginx just sends back the file contents. Otherwise, it has to read the file and prepare a new stream so that -metadata comes before media data. +the metadata comes before the media data. This involves some CPU, memory, and disk I/O overhead, so it is a good idea to For a matching request with a non-zero start -argument, nginx will read metadata from the file, prepare the +argument, nginx will read the metadata from the file, prepare the stream starting from the requested offset, and send it to a client. This has the same overhead as described above. @@ -82,13 +83,13 @@ --with-http_mp4_module configuration parameter. -If a third-party mp4 module was previously used, it needs to be disabled. +If a third-party mp4 module was previously used, it should be disabled. -A similar pseudo-streaming support for FLV files is provided by the module -ngx_http_flv_module. +A similar pseudo-streaming support for FLV files is provided by the +ngx_http_flv_module module.

@@ -133,7 +134,7 @@ location -Sets the initial size of a memory buffer used to process MP4 files. +Sets the initial size of a memory buffer used for processing MP4 files. @@ -149,9 +150,9 @@ During metadata processing, a larger buffer may become necessary. Its size cannot exceed the specified size, -or else nginx will return the server error -, -and log the following: +or else nginx will return the + server error, +and log the following message: "/some/movie/file.mp4" mp4 moov atom is too large: 12583268, you may want to increase mp4_max_buffer_size diff -r fadccc156188 -r 95c3c3bbf1ce xml/en/docs/http/ngx_http_perl_module.xml --- a/xml/en/docs/http/ngx_http_perl_module.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/en/docs/http/ngx_http_perl_module.xml Wed Aug 14 12:03:41 2013 +0400 @@ -15,8 +15,8 @@

-The ngx_http_perl_module module allows to implement -location and variable handlers in Perl, and to insert Perl calls into SSI. +The ngx_http_perl_module module is used to implement +location and variable handlers in Perl and insert Perl calls into SSI. @@ -25,7 +25,7 @@ configuration parameter. This module requires Perl version 5.6.1 or higher. -The C compiler should be compatible with that used to build Perl. +The C compiler should be compatible with the one used to build Perl. @@ -40,11 +40,11 @@ In order for Perl to recompile the modified modules during -reconfiguration, it needs to be built with the parameters +reconfiguration, it should be built with the -Dusemultiplicity=yes or --Dusethreads=yes. -Also, in order for Perl to leak less memory at run time, -it needs to be built with the +-Dusethreads=yes parameters. +Also, to make Perl leak less memory at run time, +it should be built with the -Dusemymalloc=no parameter. To check the values of these parameters in an already built Perl (preferred values are specified in the example), run: @@ -56,40 +56,40 @@ -Note that after rebuilding Perl with the new parameters +Note that after rebuilding Perl with the new -Dusemultiplicity=yes or --Dusethreads=yes, +-Dusethreads=yes parameters, all binary Perl modules will have to be rebuilt as well — they will just stop working with the new Perl. -It is possible for the main process and then worker processes -to grow in size after every reconfiguration. +There is a possibility that the main process and then worker processes will +grow in size after every reconfiguration. If the main process grows to an unacceptable size, the live upgrade -procedure can be applied without changing an executable file. +procedure can be applied without changing the executable file. -While a Perl module performs long term operation, for example, resolves -a domain name, connects to another server, queries a database, -other requests assigned to this worker process will not be processed. -It is thus recommended to limit the work done to operations -that have predictable and short execution time, for example, -access local file system. +While the Perl module is performing a long-running operation, such as +resolving a domain name, connecting to another server, or querying a database, +other requests assigned to the current worker process will not be processed. +It is thus recommended to perform only such operations +that have predictable and short execution time, such as +accessing the local file system. -The below mentioned issues only affect versions of nginx before 0.6.22. +The issues mentioned below affect only the nginx versions before 0.6.22. -Data returned by the $r request object methods -only has a text value, and the value itself is stored in memory +The $r request object methods return +data only as a string value, and the value itself is stored in memory allocated by nginx from its own pools, not by Perl. -This allows to reduce the number of copy operations involved in -most cases, however it can lead to errors in some cases. -For example, a worker process trying to use such a data in the +This helps to reduce the number of copy operations involved in +most cases; however it can lead to errors in some cases. +For example, a worker process trying to use such data in the numeric context will terminate with an error (FreeBSD): nginx in realloc(): warning: pointer to wrong page @@ -102,7 +102,7 @@ Out of memory! Callback called exit. -The workaround is simple — a method’s value should be assigned +The workaround is simple — the method’s value should be assigned to a variable. For example, the following code @@ -121,8 +121,8 @@ object methods (except for the $r->filename and $r->request_body_file methods). Thus, such values cannot be used as filenames and the likes. -The workaround is similar to a previous case — the value should either be -assigned to a variable (this results in data copying that in turn adds +The workaround is similar to the previous case — the value should either be +assigned to a variable (this results in data copying and adding of the necessary null character) or used in an expression, for example: open FILE, '/path/' . $r->variable('name'); @@ -203,7 +203,7 @@ limit_except -Installs a Perl handler for the given location. +Sets a Perl handler for the given location. @@ -229,7 +229,7 @@ Defines the name of a module that will be loaded during each reconfiguration. -There could be several perl_require directives. +Several perl_require directives can be present. @@ -284,9 +284,9 @@ returns 0 if there is no body in a request. -If there is a body, the specified handler is installed +If there is a body, the specified handler is set for the request and 1 is returned. -After reading the request body, nginx will call the installed handler. +After reading the request body, nginx will call the specified handler. Note that the handler function should be passed by reference. Example: @@ -332,17 +332,18 @@ $r->discard_request_body

-instructs nginx to discard a request body. +instructs nginx to discard the request body.

$r->header_in(field)

-returns value of the specified client request header field. +returns the value of the specified client request header field.

$r->header_only

-determines should the whole response or only its header be sent to a client. +determines whether the whole response or only its header should be sent to +the client.

@@ -358,9 +359,9 @@

does an internal redirect to the specified uri. -An actual redirect happens after the Perl handler has completed. +An actual redirect happens after the Perl handler execution is completed. -Redirections to named locations are not currently supported. +Redirections to named locations are currently not supported. @@ -380,37 +381,37 @@ $r->request_body

-returns a client request body if it was not +returns the client request body if it has not been written to a temporary file. -To ensure that a client request body is in memory, -its size should be limited with +To ensure that the client request body is in memory, +its size should be limited by , -and a sufficient buffer size should be set with +and a sufficient buffer size should be set using .

$r->request_body_file

-returns the name of a file with the client request body. -At the end of processing, the file needs to be removed. +returns the name of the file with the client request body. +After the processing, the file should be removed. To always write a request body to a file, -needs to be enabled. +should be enabled.

$r->request_method

-returns client request HTTP method. +returns the client request HTTP method.

$r->remote_addr

-returns client IP address. +returns the client IP address.

$r->flush

-immediately sends data to a client. +immediately sends data to the client.

@@ -419,9 +420,9 @@ length]])

-sends the specified file content to a client. +sends the specified file content to the client. Optional parameters -specify an initial offset and length of data to be transmitted. +specify the initial offset and length of the data to be transmitted. The actual data transmission happens after the Perl handler has completed. @@ -430,11 +431,11 @@ $r->send_http_header([type])

-sends the response header to a client. -An optional type parameter sets the value of +sends the response header to the client. +The optional type parameter sets the value of the

Content-Type

response header field. If the value is an empty string, the

Content-Type

-header field will not be passed. +header field will not be sent.

$r->status(code) @@ -500,7 +501,7 @@ value]) -returns or sets a value of the specified variable. +returns or sets the value of the specified variable. Variables are local to each request. diff -r fadccc156188 -r 95c3c3bbf1ce xml/en/docs/http/ngx_http_proxy_module.xml --- a/xml/en/docs/http/ngx_http_proxy_module.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/en/docs/http/ngx_http_proxy_module.xml Wed Aug 14 12:03:41 2013 +0400 @@ -48,12 +48,12 @@ 0.8.22 -Makes outgoing connections to a proxied server to originate +Makes outgoing connections to a proxied server originate from the specified local IP address. -Value of the parameter can contain variables (1.3.12). +Parameter value can contain variables (1.3.12). The special value off (1.3.12) cancels the effect of the proxy_bind directive -inherited from the previous configuration level, allowing the +inherited from the previous configuration level, which allows the system to auto-assign the local IP address. @@ -324,9 +324,10 @@ A cached response is first written to a temporary file, -then the file is renamed. +and then the file is renamed. Starting from version 0.8.9, temporary files and the cache can be put on -different file systems, but be aware that in this case a file is copied +different file systems. +However, be aware that in this case a file is copied across two file systems instead of the cheap renaming operation. It is thus recommended that for any given location both cache and a directory holding temporary files, set by the directive, @@ -386,7 +387,7 @@ Determines in which cases a stale cached response can be used -when an error occurs in working with the proxied server. +when an error occurs during communication with the proxied server. The directive’s parameters match the parameters of the directive. @@ -421,7 +422,7 @@ proxy_cache_valid 200 302 10m; proxy_cache_valid 404 1m; -set 10 minutes of caching for responses with codes 200 and 302, +set 10 minutes of caching for responses with codes 200 and 302 and 1 minute for responses with code 404. @@ -449,7 +450,7 @@ This has higher priority than setting of caching time using the directive. The

X-Accel-Expires

header field sets caching time of a response in seconds. -The 0 value disables caching for a response. +The zero value disables caching for a response. If a value starts with the @ prefix, it sets an absolute time in seconds since Epoch, up to which the response may be cached. If header does not include the

X-Accel-Expires

field, @@ -775,7 +776,7 @@ Determines whether proxied responses with codes greater than or equal to 300 should be passed to a client or be redirected to nginx for processing -by the directive. +with the directive. @@ -792,7 +793,7 @@ When buffering of responses from the proxied server is enabled, and the whole response does not fit into the memory buffers set by the and -directives, a part of a response can be saved to a temporary file. +directives, a part of the response can be saved to a temporary file. This directive sets the maximum size of a temporary file. The size of data written to a temporary file at a time is set by the directive. @@ -1072,7 +1073,7 @@ Defines a timeout for reading a response from the proxied server. -A timeout is only set between two successive read operations, +A timeout is set only between two successive read operations, not for the transmission of the whole response. If a proxied server does not transmit anything within this time, a connection is closed. @@ -1089,7 +1090,7 @@ location -Allows disabling a passing of the original request body +Indicates whether the original request body is passed to the proxied server. location /x-accel-redirect-here/ { @@ -1115,7 +1116,7 @@ location -Allows disabling a passing of the header fields of the original request +Indicates whether the header fields of the original request are passed to the proxied server. location /x-accel-redirect-here/ { @@ -1277,7 +1278,7 @@ Sets a timeout for transmitting a request to the proxied server. -A timeout is only set between two successive write operations, +A timeout is set only between two successive write operations, not for the transmission of the whole request. If a proxied server does not receive anything within this time, a connection is closed. @@ -1406,14 +1407,14 @@ The modification time of files is set according to the received

Last-Modified

response header field. -A response is first written to a temporary file, then a file is renamed. +A response is first written to a temporary file, and then the file is renamed. Starting from version 0.8.9, temporary files and the persistent store -can be put on different file systems, but be aware that in this case -a file is copied across two file systems instead of the cheap renaming -operation. +can be put on different file systems. +However, be aware that in this case a file is copied +across two file systems instead of the cheap renaming operation. It is thus recommended that for any given location both saved files and a -directory holding temporary files set by the -directive are put on the same file system. +directory holding temporary files, set by the +directive, are put on the same file system. diff -r fadccc156188 -r 95c3c3bbf1ce xml/en/docs/http/ngx_http_random_index_module.xml --- a/xml/en/docs/http/ngx_http_random_index_module.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/en/docs/http/ngx_http_random_index_module.xml Wed Aug 14 12:03:41 2013 +0400 @@ -17,8 +17,8 @@ The ngx_http_random_index_module module processes requests ending with the slash character (‘/’) and picks a random -file in a directory as an index file. -It works before the +file in a directory to serve as an index file. +The module is processed before the ngx_http_index_module module. diff -r fadccc156188 -r 95c3c3bbf1ce xml/en/docs/http/ngx_http_realip_module.xml --- a/xml/en/docs/http/ngx_http_realip_module.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/en/docs/http/ngx_http_realip_module.xml Wed Aug 14 12:03:41 2013 +0400 @@ -15,7 +15,7 @@

-The ngx_http_realip_module module allows +The ngx_http_realip_module module is used to change the client address to the one sent in the specified header field. diff -r fadccc156188 -r 95c3c3bbf1ce xml/en/docs/http/ngx_http_referer_module.xml --- a/xml/en/docs/http/ngx_http_referer_module.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/en/docs/http/ngx_http_referer_module.xml Wed Aug 14 12:03:41 2013 +0400 @@ -15,7 +15,7 @@

-The ngx_http_referer_module module allows to block +The ngx_http_referer_module module is used to block access to a site for requests with invalid values in the

Referer

header field. It should be kept in mind that fabricating a request with an appropriate @@ -57,7 +57,7 @@ Sets the bucket size for the valid referers hash tables. -Details of setting up hash tables are provided in a separate +The details of setting up hash tables are provided in a separate document. @@ -73,7 +73,7 @@ Sets the maximum size of the valid referers hash tables. -Details of setting up hash tables are provided in a separate +The details of setting up hash tables are provided in a separate document. @@ -92,8 +92,8 @@ location -Specifies values of the

Referer

request header field -that will cause the embedded variable $invalid_referer to +Specifies the

Referer

request header field values +that will cause the embedded $invalid_referer variable to be set to an empty string. Otherwise, the variable will be set to “1”. Search for a match is case-insensitive. @@ -111,8 +111,8 @@ blocked the

Referer

field is present in the request header, -but its value was deleted by a firewall or proxy server; -such values are strings that do not start from +but its value has been deleted by a firewall or proxy server; +such values are strings that do not start with “http://” or “https://”; @@ -126,7 +126,7 @@ defines a server name and an optional URI prefix. A server name can have an “*” at the beginning or end. -When checking, the server’s port in the

Referer

field +During the checking, the server’s port in the

Referer

field is ignored; diff -r fadccc156188 -r 95c3c3bbf1ce xml/en/docs/http/ngx_http_rewrite_module.xml --- a/xml/en/docs/http/ngx_http_rewrite_module.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/en/docs/http/ngx_http_rewrite_module.xml Wed Aug 14 12:03:41 2013 +0400 @@ -15,7 +15,7 @@

-The ngx_http_rewrite_module module allows to +The ngx_http_rewrite_module module is used to change URIs using regular expressions, return redirects, and conditionally select configurations. @@ -36,11 +36,11 @@ the directives of this module specified in the selected - are processed, -and if they changed a URI, a new location is searched for the new URI. + are processed. +If they have been changing a URI, a new location is searched for the new URI. This cycle may be repeated up to 10 times -after which the error +after which the error is returned. @@ -85,8 +85,8 @@ The specified condition is evaluated. -If true, the directives of this module specified inside the braces are -executed, and a request is assigned the configuration inside the +If true, this module directives specified inside the braces are +executed, and the request is assigned the configuration inside the if directive. Configurations inside the if directives are inherited from the previous configuration level. @@ -106,40 +106,40 @@ -comparing a variable with a string using the +comparison of a variable with a string using the “=” and “!=” operators; -matching a variable against a regular expression using the +matching of a variable against a regular expression using the “~” (for case-sensitive matching) and “~*” (for case-insensitive matching) operators. Regular expressions can contain captures that are made available for later reuse in the $1..$9 variables. Negative operators “!~” and “!~*” are also available. -If a regular expression includes the characters “}” -or “;”, the whole expression should be enclosed +If a regular expression includes the “}” +or “;” characters, the whole expressions should be enclosed in single or double quotes. -checking a file existence with the “-f” and +checking of a file existence with the “-f” and “!-f” operators; -checking a directory existence with the “-d” and +checking of a directory existence with the “-d” and “!-d” operators; -checking a file, directory, or symbolic link existence with the +checking of a file, directory, or symbolic link existence with the “-e” and “!-e” operators; -checking for an executable file with operators “-x” +checking for an executable file with the “-x” and “!-x” operators. @@ -170,7 +170,7 @@ } -A value of the embedded variable $invalid_referer is set by the +A value of the $invalid_referer embedded variable is set by the directive. @@ -195,11 +195,11 @@ Starting from version 0.8.42, it is possible to specify -either the URL of redirect (for codes 301, 302, 303, and 307), -or the text of a response body (for other codes). -A response body text or URL of redirect can contain variables. -As a special case, a URL of redirect can be specified as a URI -local to this server, in which case the full URL of redirect +either a redirect URL (for codes 301, 302, 303, and 307), +or the response body text (for other codes). +A response body text and redirect URL can contain variables. +As a special case, a redirect URL can be specified as a URI +local to this server, in which case the full redirect URL is formed according to the request scheme ($scheme) and the and directives. @@ -208,8 +208,8 @@ In addition, a URL for temporary redirect with the code 302 can be specified as the sole parameter. -Such a parameter should start with the string “http://”, -“https://”, or “$scheme”. +Such a parameter should start with the “http://”, +“https://”, or “$scheme” string. A URL can contain variables. @@ -242,9 +242,9 @@ as specified in the replacement string. The rewrite directives are executed sequentially in order of their appearance in the configuration file. -Flags make it possible to terminate further processing of directives. +It is possible to terminate further processing of the directives using flags. If a replacement string starts with “http://” -or “https://”, the processing stops and a +or “https://”, the processing stops and the redirect is returned to a client. @@ -255,8 +255,8 @@ last

stops processing the current set of -ngx_http_rewrite_module directives -followed by a search for a new location matching the changed URI; +ngx_http_rewrite_module directives and starts +a search for a new location matching the changed URI;

break @@ -267,18 +267,18 @@ redirect

-returns a temporary redirect with the code 302; +returns a temporary redirect with the 302 code; used if a replacement string does not start with “http://” or “https://”;

permanent

-returns a permanent redirect with the code 301. +returns a permanent redirect with the 301 code. -The full URL of redirects is formed according to the +The full redirect URL is formed according to the request scheme ($scheme) and the and directives. @@ -300,8 +300,8 @@ But if these directives are put inside the “/download/” location, the last flag should be replaced by -break, otherwise nginx will make 10 cycles and -return the error 500: +break, or otherwise nginx will make 10 cycles and +return the 500 error: location /download/ { rewrite ^(/download/.*)/media/(.*)\..*$ $1/mp3/$2.mp3 break; @@ -322,8 +322,8 @@ -If a regular expression includes the characters “}” -or “;”, the whole expression should be enclosed +If a regular expression includes the “}” +or “;” characters, the whole expressions should be enclosed in single or double quotes. @@ -384,7 +384,7 @@ The ngx_http_rewrite_module module directives -are compiled during the configuration stage into internal instructions +are compiled at the configuration stage into internal instructions that are interpreted during request processing. An interpreter is a simple virtual stack machine. diff -r fadccc156188 -r 95c3c3bbf1ce xml/en/docs/http/ngx_http_secure_link_module.xml --- a/xml/en/docs/http/ngx_http_secure_link_module.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/en/docs/http/ngx_http_secure_link_module.xml Wed Aug 14 12:03:41 2013 +0400 @@ -16,29 +16,29 @@ The ngx_http_secure_link_module module (0.7.18) -allows to check authenticity of requested links, +is used to check authenticity of requested links, protect resources from unauthorized access, -and limit lifetime of links. +and limit link lifetime. The authenticity of a requested link is verified by comparing the checksum value passed in a request with the value computed for the request. -If link has a limited lifetime and the time has expired, +If a link has a limited lifetime and the time has expired, the link is considered outdated. -Status of these checks is made available in the +The status of these checks is made available in the $secure_link variable. The module provides two alternative operation modes. The first mode is enabled by the -directive and allows to check authenticity of requested links +directive and is used to check authenticity of requested links as well as protect resources from unauthorized access. The second mode (0.8.50) is enabled by the and -directives, and also allows to limit lifetime of links. +directives and is also used to limit lifetime of links. @@ -61,7 +61,7 @@ Defines a string with variables from which the -checksum value and lifetime of a link are to be extracted. +checksum value and lifetime of a link will be extracted. @@ -70,28 +70,28 @@ -Checksum value extracted from the string is compared with -MD5 hash value computed for expression defined by the +The checksum value extracted from the string is compared with +the MD5 hash value of the expression defined by the directive. -If checksums are different, the $secure_link variable +If the checksums are different, the $secure_link variable is set to an empty string. -If checksums are the same, lifetime of a link is checked. -If link has a limited lifetime and the time has expired, +If the checksums are the same, the link lifetime is checked. +If the link has a limited lifetime and the time has expired, the $secure_link variable is set to “0”. Otherwise, it is set to “1”. -MD5 hash value passed in a request is encoded in +The MD5 hash value passed in a request is encoded in base64url. -If link has a limited lifetime, an expiration time +If a link has a limited lifetime, the expiration time is set in seconds since Epoch (Thu, 01 Jan 1970 00:00:00 GMT). -The value is specified in an expression after MD5 hash, -and is separated by comma. -An expiration time passed in a request is made available in -the $secure_link_expires variable for use in +The value is specified in the expression after the MD5 hash, +and is separated by a comma. +The expiration time passed in a request is available through +the $secure_link_expires variable for a use in the directive. -If expiration time is not specified, a link has unlimited +If the expiration time is not specified, a link has the unlimited lifetime. @@ -106,21 +106,20 @@ location -Defines an expression for which the MD5 hash value is to +Defines an expression for which the MD5 hash value will be computed and compared with the value passed in a request. -An expression should contain the secured part of a link (resource) +The expression should contain the secured part of a link (resource) and a secret ingredient. -If link has a limited lifetime, -an expression should also contain $secure_link_expires. +If the link has a limited lifetime, +the expression should also contain $secure_link_expires. -To prevent unauthorized access, an expression may contain some -information about the client, such as its address and version -of the browser. +To prevent unauthorized access, the expression may contain some +information about the client, such as its address and browser version. @@ -141,11 +140,12 @@ ... } -The link +The “/s/link?md5=_e4Nc3iduzkWRm01TBBNYw&expires=2147483647” -restricts access to “/s/link” for the client with IP address -127.0.0.1. -The link also has a limited lifetime until January 19, 2038 (GMT). +link +restricts access to “/s/link” for the client with the +IP address 127.0.0.1. +The link also has the limited lifetime until January 19, 2038 (GMT). @@ -174,13 +174,13 @@ /prefix/hash/link -where hash is a hexadecimal representation of an -MD5 hash computed for the concatenation of link and secret word, +where hash is a hexadecimal representation of the +MD5 hash computed for the concatenation of the link and secret word, and prefix is an arbitrary string without slashes. -If requested link passes the authenticity check, +If the requested link passes the authenticity check, the $secure_link variable is set to the link extracted from the request URI. Otherwise, the $secure_link variable @@ -228,13 +228,13 @@ $secure_link

-Status of a link check. +The status of a link check. The specific value depends on the selected operation mode.

$secure_link_expires

-Lifetime of a link passed in a request; +The lifetime of a link passed in a request; intended to be used only in the directive. diff -r fadccc156188 -r 95c3c3bbf1ce xml/en/docs/http/ngx_http_spdy_module.xml --- a/xml/en/docs/http/ngx_http_spdy_module.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/en/docs/http/ngx_http_spdy_module.xml Wed Aug 14 12:03:41 2013 +0400 @@ -82,9 +82,9 @@ server -Sets a header compression level of a response in a range from +Sets the header compression level of a response in a range from 1 (fastest, less compression) to 9 (slowest, best compression). -The special value 0 turns off header compression. +The special value 0 turns off the header compression. diff -r fadccc156188 -r 95c3c3bbf1ce xml/en/docs/http/ngx_http_split_clients_module.xml --- a/xml/en/docs/http/ngx_http_split_clients_module.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/en/docs/http/ngx_http_split_clients_module.xml Wed Aug 14 12:03:41 2013 +0400 @@ -62,8 +62,8 @@ The value of the original string is hashed using MurmurHash2. In the example given, hash values from 0 to 21474835 (0.5%) -correspond to the $variant variable taking the -value ".one", +correspond to the +value ".one" of the $variant variable, hash values from 21474836 to 107374180 (2%) correspond to the value ".two", and hash values from 107374181 to 4294967295 correspond to diff -r fadccc156188 -r 95c3c3bbf1ce xml/en/docs/http/ngx_http_ssi_module.xml --- a/xml/en/docs/http/ngx_http_ssi_module.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/en/docs/http/ngx_http_ssi_module.xml Wed Aug 14 12:03:41 2013 +0400 @@ -64,7 +64,7 @@ 1.5.1 -Allows to preserve the

Last-Modified

header field +Allows preserving the

Last-Modified

header field from the original response during SSI processing to facilitate response caching. @@ -102,9 +102,9 @@ location -Allows to suppress output of the string +If enabled, suppresses the output of the “[an error occurred while processing the directive]” -if an error occurred during SSI processing. +string if an error occurred during SSI processing. @@ -134,7 +134,7 @@ location -Sets the maximum length for values of parameters in SSI commands. +Sets the maximum length of parameter values in SSI commands. @@ -216,12 +216,12 @@

var

-variable name. +the variable name.

encoding

-encoding method. +the encoding method. Possible values include none, url, and entity. By default, entity is used. @@ -229,7 +229,7 @@ default

-non-standard parameter that sets a string to be output +a non-standard parameter that sets a string to be output if a variable is undefined. By default, “none” is output. The command @@ -339,9 +339,9 @@ stub

-non-standard parameter that names the block whose -content will be output if an included request results in an empty -body or if an error occurs during request processing, for example: +a non-standard parameter that names the block whose +content will be output if the included request results in an empty +body or if an error occurs during the request processing, for example:    @@ -351,7 +351,7 @@ wait

-non-standard parameter that instructs to wait for a request to fully +a non-standard parameter that instructs to wait for a request to fully complete before continuing with SSI processing, for example:  @@ -360,7 +360,7 @@ set

-non-standard parameter that instructs to write a successful result +a non-standard parameter that instructs to write a successful result of request processing to the specified variable, for example: @@ -385,12 +385,12 @@

var

-variable name. +the variable name.

value

-variable value. +the variable value. If an assigned value contains variables, their values are substituted. @@ -413,7 +413,7 @@ $date_local -current time in local time zone. +current time in the local time zone. The format is set by the config command with the timefmt parameter. diff -r fadccc156188 -r 95c3c3bbf1ce xml/en/docs/http/ngx_http_ssl_module.xml --- a/xml/en/docs/http/ngx_http_ssl_module.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/en/docs/http/ngx_http_ssl_module.xml Wed Aug 14 12:03:41 2013 +0400 @@ -47,11 +47,11 @@ -enable shared session cache, +enable the shared session cache, -disable built-in session cache, +disable the built-in session cache, @@ -113,7 +113,7 @@ server -Specifies a file with a certificate in the PEM format +Specifies a file with the certificate in the PEM format for the given virtual server. If intermediate certificates should be specified in addition to a primary certificate, they should be specified in the same file @@ -156,7 +156,7 @@ server -Specifies a file with a secret key in the PEM format +Specifies a file with the secret key in the PEM format for the given virtual server. @@ -271,13 +271,13 @@ Enables the specified protocols. -The parameters TLSv1.1 and TLSv1.2 work -only when using the OpenSSL library version 1.0.1 and higher. +The TLSv1.1 and TLSv1.2 parameters work +only when the OpenSSL library of version 1.0.1 or higher is used. -The parameters TLSv1.1 and TLSv1.2 are -supported starting from versions 1.1.13 and 1.0.12 -so when using OpenSSL version 1.0.1 -and higher on older nginx versions these protocols will work but could not +The TLSv1.1 and TLSv1.2 parameters are +supported starting from versions 1.1.13 and 1.0.12, +so when the OpenSSL version 1.0.1 or higher +is used on older nginx versions, these protocols work, but cannot be disabled. @@ -296,21 +296,21 @@ server -Sets types and sizes of caches that store session parameters. -A cache can be any of the following types: +Sets the types and sizes of caches that store session parameters. +A cache can be of any of the following types:

off

-the use of session cache is strictly prohibited: +the use of a session cache is strictly prohibited: nginx explicitly tells a client that sessions may not be reused.

none

-the use of session cache is gently disallowed: +the use of a session cache is gently disallowed: nginx tells a client that sessions may be reused, but does not -actually do that. +actually store session parameters in the cache.

builtin @@ -323,7 +323,7 @@ shared

-shared between all worker processes. +a cache shared between all worker processes. The cache size is specified in bytes; one megabyte can store about 4000 sessions. Each shared cache should have an arbitrary name. @@ -378,19 +378,19 @@

-For the OCSP stapling to work, the certificate of the issuer of the server -certificate should be known. +For the OCSP stapling to work, the certificate of the server certificate +issuer should be known. If the file does not contain intermediate certificates, -the certificate of the issuer of the server certificate should be +the certificate of the server certificate issuer should be present in the file. -The directive -should also be specified to allow for a resolution -of an OCSP responder hostname. +For a resolution of the OCSP responder hostname, +the directive +should also be specified. @@ -425,7 +425,7 @@ 1.3.7 -Overrides the URL of OCSP responder specified in the +Overrides the URL of the OCSP responder specified in the “Authority Information Access” certificate extension. @@ -452,8 +452,8 @@ -For verification to work, the certificate of the issuer of the server -certificate, the root certificate, and all intermediate certificates +For verification to work, the certificate of the server certificate +issuer, the root certificate, and all intermediate certificates should be configured as trusted using the directive. @@ -475,8 +475,8 @@

-In contrast to , the list of these -certificates will not be sent to clients. +In contrast to the certificate set by , +the list of these certificates will not be sent to clients. @@ -492,22 +492,22 @@ Enables verification of client certificates. -The result of verification is stored in the +The verification result is stored in the $ssl_client_verify variable. The optional parameter (0.8.7+) requests the client -certificate, and if certificate was present, verifies it. +certificate and verifies it if the certificate is present. The optional_no_ca parameter (1.3.8, 1.2.5) requests the client certificate but does not require it to be signed by a trusted CA certificate. -This is intended for the use in cases where actual certificate verification -is performed by a service that is external to nginx. -The contents of a certificate is made available through the +This is intended for the use in cases when a service that is external to nginx +performs the actual certificate verification. +The contents of the certificate is accessible through the $ssl_client_cert variable. @@ -521,7 +521,7 @@ server -Sets a verification depth in the client certificates chain. +Sets the verification depth in the client certificates chain. @@ -544,21 +544,21 @@ 496

-a client did not present the required certificate; +a client has not presented the required certificate;

497

-a regular request was sent to the HTTPS port. +a regular request has been sent to the HTTPS port.

-A redirection happens after the request was fully parsed and -variables such as $request_uri, -$uri, $args and others were made available. +The redirection happens after the request is fully parsed and +the variables, such as $request_uri, +$uri, $args and others, are available.

diff -r fadccc156188 -r 95c3c3bbf1ce xml/en/docs/http/ngx_http_status_module.xml --- a/xml/en/docs/http/ngx_http_status_module.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/en/docs/http/ngx_http_status_module.xml Wed Aug 14 12:03:41 2013 +0400 @@ -14,7 +14,7 @@

-The module ngx_http_status_module provides +The ngx_http_status_module module provides access to various status information. diff -r fadccc156188 -r 95c3c3bbf1ce xml/en/docs/http/ngx_http_sub_module.xml --- a/xml/en/docs/http/ngx_http_sub_module.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/en/docs/http/ngx_http_sub_module.xml Wed Aug 14 12:03:41 2013 +0400 @@ -53,9 +53,9 @@ location -Sets a string that needs to be changed, and a replacement string. -The string to be replaced is matched ignoring the case. -A replacement string can contain variables. +Sets a string to replace and a replacement string. +The string to replace is matched ignoring the case. +The replacement string can contain variables. @@ -70,7 +70,7 @@ 1.5.1 -Allows to preserve the

Last-Modified

header field +Allows preserving the

Last-Modified

header field from the original response during replacement to facilitate response caching. @@ -91,8 +91,8 @@ location -Determines how many times to look for a string to be replaced, -once or several times. +Indicates whether to look for a string to replace once or +several times. diff -r fadccc156188 -r 95c3c3bbf1ce xml/en/docs/http/ngx_http_upstream_module.xml --- a/xml/en/docs/http/ngx_http_upstream_module.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/en/docs/http/ngx_http_upstream_module.xml Wed Aug 14 12:03:41 2013 +0400 @@ -16,8 +16,8 @@ The ngx_http_upstream_module module -allows to define groups of servers that can be referenced -from the , +is used to define groups of servers that can be referenced +by the , , and directives. @@ -105,16 +105,16 @@ -By default, requests are distributed between servers using a +By default, requests are distributed between the servers using a weighted round-robin balancing method. In the above example, each 7 requests will be distributed as follows: -5 requests to backend1.example.com -and one request to each of second and third servers. -If an error occurs when communicating with the server, a request will +5 requests go to backend1.example.com +and one request to each of the second and third servers. +If an error occurs during communication with a server, the request will be passed to the next server, and so on until all of the functioning servers will be tried. If a successful response could not be obtained from any of the servers, -the client will be returned the result of contacting the last server. +the client will receive the result of the communication with the last server. @@ -126,14 +126,14 @@ upstream -Defines an address and other parameters -of the server. -An address can be specified as a domain name or IP address, -and an optional port, or as a UNIX-domain socket path +Defines the address and other parameters +of a server. +The address can be specified as a domain name or IP address, +with an optional port, or as a UNIX-domain socket path specified after the “unix:” prefix. -If port is not specified, the port 80 is used. -A domain name that resolves to several IP addresses essentially defines -multiple servers. +If a port is not specified, the port 80 is used. +A domain name that resolves to several IP addresses defines +multiple servers at once. @@ -142,17 +142,17 @@ weight=number

-sets a weight of the server, by default 1. +sets the weight of the server, by default, 1.

max_fails=number

-sets a number of unsuccessful attempts to communicate with the server -during a time set by the fail_timeout parameter -after which it will be considered down for a period of time also set -by the fail_timeout parameter. +sets the number of unsuccessful attempts to communicate with the server +that should happen in the duration set by the fail_timeout +parameter to consider the server down for a duration also set by the +fail_timeout parameter. By default, the number of unsuccessful attempts is set to 1. -A value of zero disables accounting of attempts. +The zero value disables the accounting of attempts. What is considered an unsuccessful attempt is defined by the , , and @@ -166,17 +166,16 @@ -a time during which the specified number of unsuccessful attempts to -communicate with the server should happen for the server to be -considered down; +the time during which the specified number of unsuccessful attempts to +communicate with the server should happen to consider the server down; -and a period of time the server will be considered down. +and the period of time the server will be considered down. -By default, timeout is set to 10 seconds. +By default, the parameter is set to 10 seconds.

slow_start=time @@ -257,10 +256,10 @@ are distributed between servers based on client IP addresses. The first three octets of the client IPv4 address, or the entire IPv6 address, are used as a hashing key. -The method ensures that requests of the same client will always be -passed to the same server except when this server is considered down -in which case client requests will be passed to another server and -most probably it will also be the same server. +The method ensures that requests from the same client will always be +passed to the same server except when this server is considered down. +In the latter case client requests will be passed to another server. +Most probably, it will always be the same server as well. IPv6 addresses are supported starting from versions 1.3.2 and 1.2.2. @@ -288,7 +287,7 @@ -Until versions 1.3.1 and 1.2.2 it was not possible to specify a weight for +Until versions 1.3.1 and 1.2.2, it was not possible to specify a weight for servers using the ip_hash load balancing method. @@ -303,22 +302,21 @@ 1.1.4 -Activates cache of connections to upstream servers. +Activates the cache for connections to upstream servers. The connections parameter sets the maximum number of -idle keepalive connections to upstream servers that are retained in -the cache per one worker process. +idle keepalive connections to upstream servers that are preserved in +the cache of each worker process. When this number is exceeded, the least recently used connections are closed. -It should be particularly noted that keepalive directive -does not limit the total number of connections that nginx worker process -can open to upstream servers. -The connections parameter should be set low enough -to allow upstream servers to process additional new incoming -connections as well. +It should be particularly noted that the keepalive directive +does not limit the total number of connections to upstream servers +that an nginx worker process can open. +The connections parameter should be set to a number small enough +to let upstream servers process new incoming connections as well. @@ -372,7 +370,7 @@ Alternatively, HTTP/1.0 persistent connections can be used by passing the

Connection: Keep-Alive

header field to an upstream server, -though this is not recommended. +though this method is not recommended. @@ -402,7 +400,7 @@ When using load balancer methods other than the default -round-robin, it is necessary to activate them before +round-robin method, it is necessary to activate them before the keepalive directive. @@ -583,10 +581,10 @@ status is neither 301 nor 302 status 200-399; -status is in the 200..399 range +status is in the range from 200 to 399 status ! 400-599; -status is not in the 400..599 range +status is not in the range from 400 to 599

status 301-303 307;

status is either 301, 302, 303, or 307 @@ -1005,23 +1003,23 @@ $upstream_addr

-keeps an IP address and port of the server, -or a path to the UNIX-domain socket. +keeps the IP address and port of the server, +or the path to the UNIX-domain socket. If several servers were contacted during request processing, their addresses are separated by commas, e.g. “192.168.1.1:80, 192.168.1.2:80, unix:/tmp/sock”. -If an internal redirect from one server group to another happened -using +If an internal redirect from one server group to another happens, +initiated by

X-Accel-Redirect

or - -then these server groups are separated by colons, e.g. +, +then the server addresses from different groups are separated by colons, e.g. “192.168.1.1:80, 192.168.1.2:80, unix:/tmp/sock : 192.168.10.1:80, 192.168.10.2:80”.

$upstream_cache_status

-keeps status of accessing a response cache (0.8.3). -The status can be one of “MISS”, +keeps the status of accessing a response cache (0.8.3). +The status can be either “MISS”, “BYPASS”, “EXPIRED”, “STALE”, “UPDATING” or “HIT”. @@ -1029,34 +1027,34 @@ $upstream_response_length

-keeps lengths of responses obtained from upstream servers (0.7.27); +keeps the lengths of responses obtained from the upstream servers (0.7.27); lengths are kept in bytes. -Several responses are separated by commas and colons -like in the $upstream_addr variable. +Several response lengths are separated by commas and colons +like addresses in the $upstream_addr variable.

$upstream_response_time

keeps times of responses obtained from upstream servers; times are kept in seconds with a milliseconds resolution. -Several responses are separated by commas and colons -like in the $upstream_addr variable. +Several response times are separated by commas and colons +like addresses in the $upstream_addr variable.

$upstream_status

keeps codes of responses obtained from upstream servers. -Several responses are separated by commas and colons -like in the $upstream_addr variable. +Several response codes are separated by commas and colons +like addresses in the $upstream_addr variable.

$upstream_http_...

keep server response header fields. For example, the

Server

response header field -is made available through the $upstream_http_server variable. +is available through the $upstream_http_server variable. The rules of converting header field names to variable names are the same -as for variables starting with the +as for the variables that start with the “$http_” prefix. Only the last server’s response header fields are saved. diff -r fadccc156188 -r 95c3c3bbf1ce xml/en/docs/http/ngx_http_userid_module.xml --- a/xml/en/docs/http/ngx_http_userid_module.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/en/docs/http/ngx_http_userid_module.xml Wed Aug 14 12:03:41 2013 +0400 @@ -58,30 +58,30 @@ location -Allows or prohibits to set cookies and log the received cookies: +Enables or disables setting cookies and logging the received cookies:

-allows to set version 2 cookies -and log the received cookies; +enables the setting of version 2 cookies +and logging of the received cookies;

-allows to set version 1 cookies -and log the received cookies; +enables the setting of version 1 cookies +and logging of the received cookies;

log

-prohibits to set cookies -but allows to log the received cookies; +disables the setting of cookies, +but enables logging of the received cookies;

off

-prohibits to set cookies and log the received cookies. +disables the setting of cookies and logging of the received cookies.

@@ -99,7 +99,8 @@ Defines a domain for which the cookie is set. -The parameter none disables setting a domain for a cookie. +The none parameter disables setting of a domain for the +cookie. @@ -136,20 +137,20 @@ location -If parameter is not off, enables the cookie marking -mechanism and sets a character used as a mark. -This mechanism allows to add or change - and/or cookie expiration time while +If the parameter is not off, enables the cookie marking +mechanism and sets the character used as a mark. +This mechanism is used to add or change + and/or a cookie expiration time while preserving the client identifier. -The mark can be any letter of the English alphabet (case-sensitive), +A mark can be any letter of the English alphabet (case-sensitive), digit, or the “=” character. -If a mark is set, it is compared with the first padding symbol -in the base64 representation of client identifier passed in a cookie. -If they do not match, a cookie is resent with the specified mark, -expiration time and a

P3P

header. +If the mark is set, it is compared with the first padding symbol +in the base64 representation of the client identifier passed in a cookie. +If they do not match, the cookie is resent with the specified mark, +expiration time, and

P3P

header. @@ -163,7 +164,7 @@ location -Sets a cookie name. +Sets the cookie name. @@ -178,8 +179,8 @@ Sets a value for the

P3P

header field that will be -sent along with a cookie. -If set to the special value none, +sent along with the cookie. +If the directive is set to the special value none, the

P3P

header will not be sent in a response. @@ -210,10 +211,10 @@ If identifiers are issued by multiple servers (services), each service should be assigned its own number -in order to ensure that client identifiers are unique. -For version 1 cookies the default value is zero. -For version 2 cookies this is the number composed from the last four -octets of the server’s IP address. +to ensure that client identifiers are unique. +For version 1 cookies, the default value is zero. +For version 2 cookies, the default value is the number composed from the last +four octets of the server’s IP address. @@ -235,10 +236,10 @@ $uid_reset -If set to a non-empty string, and it is not “0”, -client identifiers are reset. +If the variable is set to a non-empty string that is not “0”, +the client identifiers are reset. The special value “log” additionally leads to the output of -messages about reset identifiers to the +messages about the reset identifiers to the . diff -r fadccc156188 -r 95c3c3bbf1ce xml/en/docs/http/ngx_http_xslt_module.xml --- a/xml/en/docs/http/ngx_http_xslt_module.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/en/docs/http/ngx_http_xslt_module.xml Wed Aug 14 12:03:41 2013 +0400 @@ -59,12 +59,12 @@ Specifies the DTD file that declares character entities. -This file is compiled during the configuration stage. -For technical reasons the module is unable to use the +This file is compiled at the configuration stage. +For technical reasons, the module is unable to use the external subset declared in the processed XML, so it is -ignored and instead a specially defined file is used. -This file should not describe the XML structure, it is -enough to only declare the required character entities, for example: +ignored and a specially defined file is used instead. +This file should not describe the XML structure. +It is enough to declare just the required character entities, for example: <!ENTITY nbsp " "> @@ -82,7 +82,7 @@ 1.5.1 -Allows to preserve the

Last-Modified

header field +Allows preserving the

Last-Modified

header field from the original response during XSLT transformations to facilitate response caching. @@ -105,7 +105,7 @@ 1.1.18 -Defines parameters for XSLT stylesheets. +Defines the parameters for XSLT stylesheets. The value is treated as an XPath expression. The value can contain variables. To pass a string value to a stylesheet, @@ -132,7 +132,7 @@ 1.1.18 -Defines string parameters for XSLT stylesheets. +Defines the string parameters for XSLT stylesheets. XPath expressions in the value are not interpreted. The value can contain variables. @@ -157,7 +157,7 @@ Defines the XSLT stylesheet and its optional parameters. -A stylesheet is compiled during the configuration stage. +A stylesheet is compiled at the configuration stage. @@ -174,7 +174,7 @@ -The description of parameters can contain variables, for example, +The parameters description can contain variables, for example, the whole line of parameters can be taken from a single variable: location / { @@ -187,8 +187,8 @@ -It is possible to specify several stylesheets; in this case they -will be applied sequentially in the specified order. +It is possible to specify several stylesheets. +They will be applied sequentially in the specified order. @@ -205,8 +205,8 @@ Enables transformations in responses with the specified MIME types in addition to “text/xml”. The special value “*” matches any MIME type (0.8.29). -If the result of transformation is an HTML response, its MIME type -is changes to “text/html”. +If the transformation result is an HTML response, its MIME type +is changed to “text/html”. diff -r fadccc156188 -r 95c3c3bbf1ce xml/en/docs/http/server_names.xml --- a/xml/en/docs/http/server_names.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/en/docs/http/server_names.xml Wed Aug 14 12:03:41 2013 +0400 @@ -327,7 +327,7 @@ in three hash tables bound to the listen ports. The sizes of hash tables are optimized at the configuration phase so that a name can be found with the fewest CPU cache misses. -Details of setting up hash tables are provided in a separate +The details of setting up hash tables are provided in a separate document. diff -r fadccc156188 -r 95c3c3bbf1ce xml/en/docs/http/websocket.xml --- a/xml/en/docs/http/websocket.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/en/docs/http/websocket.xml Wed Aug 14 12:03:41 2013 +0400 @@ -32,7 +32,7 @@ Since version 1.3.13, nginx implements special mode of operation -that allows to set up a tunnel between a client and proxied +that allows setting up a tunnel between a client and proxied server if the proxied server returned a response with the code , and the client asked for a protocol switch via the

Upgrade

diff -r fadccc156188 -r 95c3c3bbf1ce xml/en/docs/mail/ngx_mail_auth_http_module.xml --- a/xml/en/docs/mail/ngx_mail_auth_http_module.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/en/docs/mail/ngx_mail_auth_http_module.xml Wed Aug 14 12:03:41 2013 +0400 @@ -35,9 +35,9 @@ server -Allows to append the specified header to requests to the authentication server. -Can be used as a shared secret to verify -that the request came in from nginx. +Appends the specified header to requests to the authentication server. +This header can be used as the shared secret to verify +that the request comes from nginx. For example: auth_http_header X-Auth-Key "secret_string"; @@ -65,11 +65,12 @@ The HTTP is used to communicate with the authentication server. -The data in the response body is ignored, information is passed only in headers. +The data in the response body is ignored, and the information is passed only in +the headers. -Requests and responses examples: +Examples of requests and responses: @@ -100,18 +101,19 @@ -If there is no the

Auth-Wait

header, -the connection will be closed after returning an error. -The current implementation allocates memory per each authentication attempt, -which is freed only at the end of a session. -Therefore a number of invalid authentication attempts in a single session +If there is no

Auth-Wait

header in a request, +an error will be returned and the connection will be closed. +The current implementation allocates memory for each authentication attempt. +The memory is freed only at the end of a session. +Therefore, the number of invalid authentication attempts in a single session must be limited — the server must response without the

Auth-Wait

header after 10-20 attempts -(see the

Auth-Login-Attempt

header). +(the attempt number is passed in the

Auth-Login-Attempt

+header). -When using the APOP or CRAM-MD5 request-response will look like: +When the APOP or CRAM-MD5 are used, a request-response will look as follows. GET /auth HTTP/1.0 Host: localhost @@ -135,10 +137,10 @@ For the SMTP, the response additionally takes into account -the

Auth-Error-Code

header — it is used -as a response code if exists. -Otherwise the code 535 5.7.0 will be added to -the

Auth-Status

by default. +the

Auth-Error-Code

header — if exists, it is used +as a response code. +Otherwise, the 535 5.7.0 code will be added to +the

Auth-Status

. @@ -150,7 +152,7 @@ Auth-Error-Code: 451 4.3.0 Auth-Wait: 3 -then the SMTP client will be given an error +then the SMTP client will receive an error 451 4.3.0 Temporary server problem, try again later diff -r fadccc156188 -r 95c3c3bbf1ce xml/en/docs/mail/ngx_mail_core_module.xml --- a/xml/en/docs/mail/ngx_mail_core_module.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/en/docs/mail/ngx_mail_core_module.xml Wed Aug 14 12:03:41 2013 +0400 @@ -78,10 +78,10 @@ server -Sets an address and a port for a socket, +Sets the address and port for the socket on which the server will accept requests. -Only port may be specified. -An address may also be a hostname, for example: +It is possible to specify just the port. +The address can also be a hostname, for example: listen 127.0.0.1:110; listen *:110; @@ -105,14 +105,13 @@ The optional bind parameter instructs to make a separate bind call for a given address:port pair. -The fact is that nginx will bind only to -*:port -if there are several listen directives with +The fact is that if there are several listen directives with the same port but different addresses, and one of the listen directives listens on all addresses -for the given port (*:port). +for the given port (*:port), nginx will +bind only to *:port. It should be noted that the getsockname system call will be -made in this case to determine an address that accepted a connection. +made in this case to determine the address that accepted the connection. @@ -129,7 +128,7 @@ main -Provides a configuration file context in which the mail server directives +Provides the configuration file context in which the mail server directives are specified. @@ -145,16 +144,16 @@ server -Sets the protocol of a proxied server. +Sets the protocol for a proxied server. Supported protocols are IMAP, -POP3 and +POP3, and SMTP. If the directive is not set, the protocol can be detected automatically -basing on the well-known port specified in the +based on the well-known port specified in the directive: @@ -190,7 +189,7 @@ mail -Sets a configuration for the server. +Sets the configuration for a server. @@ -203,7 +202,7 @@ server -Sets a name of the server, used: +Sets the server name that is used: @@ -235,9 +234,9 @@ server -Controls if the “TCP keepalive” mode should be enabled on the client’s -connection (SO_KEEPALIVE socket parameter) on the -proxied server connection. +Indicates if the “TCP keepalive” mode should be enabled on the client’s +connection (SO_KEEPALIVE socket parameter) when connecting to +a proxied server. @@ -250,7 +249,7 @@ server -Sets the timeout which is used before proxying to the backend started. +Sets the timeout that is used before proxying to the backend starts. diff -r fadccc156188 -r 95c3c3bbf1ce xml/en/docs/mail/ngx_mail_imap_module.xml --- a/xml/en/docs/mail/ngx_mail_imap_module.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/en/docs/mail/ngx_mail_imap_module.xml Wed Aug 14 12:03:41 2013 +0400 @@ -54,26 +54,26 @@ server -Allows to specify the +Sets the IMAP protocol -extensions list to be passed to the client upon -issuing the CAPABILITY command. -Authentication methods specified in the and +extensions list that is passed to the client in response to +the CAPABILITY command. +The authentication methods specified in the and STARTTLS directives are automatically added to this list if the directive is enabled. -It makes sense to specify extensions -supported by IMAP backends -to which clients are proxied (if this extensions are related to commands -used after the authentication, when nginx transparently proxies the client +It makes sense to specify the extensions +supported by the IMAP backends +to which the clients are proxied (if these extensions are related to commands +used after the authentication, when nginx transparently proxies a client connection to the backend). -The current list of standardized extensions is published at the +The current list of standardized extensions is published at www.iana.org. diff -r fadccc156188 -r 95c3c3bbf1ce xml/en/docs/mail/ngx_mail_pop3_module.xml --- a/xml/en/docs/mail/ngx_mail_pop3_module.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/en/docs/mail/ngx_mail_pop3_module.xml Wed Aug 14 12:03:41 2013 +0400 @@ -30,7 +30,7 @@ USER/PASS, AUTH PLAIN, AUTH LOGIN. -It is not possible to disable this methods. +It is not possible to disable these methods.

apop @@ -58,12 +58,12 @@ server -Allows to specify the +Sets the POP3 protocol -extensions list to be passed to the client upon -issuing the CAPA command. +extensions list that is passed to the client in response to +the CAPA command. -Authentication methods specified in the and +The authentication methods specified in the and (SASL extension) and STLS directives, are automatically added to this list if the @@ -71,15 +71,15 @@ -It makes sense to specify extensions -supported by POP3 backends -to which clients are proxied (if this extensions are related to commands +It makes sense to specify the extensions +supported by the POP3 backends +to which the clients are proxied (if these extensions are related to commands used after the authentication, when nginx transparently proxies the client connection to the backend). -The current list of standardized extensions is published at the +The current list of standardized extensions is published at www.iana.org. diff -r fadccc156188 -r 95c3c3bbf1ce xml/en/docs/mail/ngx_mail_proxy_module.xml --- a/xml/en/docs/mail/ngx_mail_proxy_module.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/en/docs/mail/ngx_mail_proxy_module.xml Wed Aug 14 12:03:41 2013 +0400 @@ -36,9 +36,9 @@ server -Sets size of the buffer used for proxying. -The buffer size is equal to one memory page by default. -Depending on a platform, this is either 4K or 8K. +Sets the size of the buffer used for proxying. +By default, the buffer size is equal to one memory page. +Depending on a platform, it is either 4K or 8K. @@ -51,19 +51,20 @@ server -Defines whether to pass the error message obtained during -an authentication on the backend to the client. +Indicates whether to pass the error message obtained during +the authentication on the backend to the client. -Usually, if the authentication in nginx was successful, -backend can’t return an error, but if it nonetheless exists, -this means there is some problem inside. -In such cases the backend message can contain the information +Usually, if the authentication in nginx is a success, +the backend cannot return an error. +If it nevertheless returns an error, +it means some internal error has occurred. +In such case the backend message can contain information that should not be shown to the client. -However responding with an error for the correct password -is a normal behavior of some POP3 servers. -For example, CommuniGatePro informs user about +However, responding with an error for the correct password +is a normal behavior for some POP3 servers. +For example, CommuniGatePro informs a user about mailbox overflow or other events by periodically outputting the authentication @@ -95,11 +96,11 @@ Enables or disables issuing of the XCLIENT command -upon the connection to the SMTP backend. -For the XCLIENT command to work it is required to have +on connection to the SMTP backend. +The XCLIENT command requires Postfix with the -patch, -which adds the LOGIN parameter. +patch +that adds the LOGIN parameter. If the XCLIENT command is not used, the MTA will be unable to write the client’s IP/HELO/LOGIN @@ -107,8 +108,8 @@ -If the xclient is enabled, -then upon a backend connection nginx first issues +If xclient is enabled, +then on a connection to the backend nginx first issues EHLO server_name @@ -116,20 +117,19 @@ XCLIENT PROTO=ESMTP HELO=client_hello ADDR=192.168.1.1 LOGIN=good_user NAME=[UNAVAILABLE] -If the client upon a connection to nginx issued the EHLO, -then the XCLIENT command will pass -the PROTO=ESMTP. -Otherwise, PROTO=SMTP will be passed. +If the client issues EHLO on a connection to nginx, +the XCLIENT command will pass +PROTO=ESMTP. +Otherwise, it will pass PROTO=SMTP. The IP address of a client is specified in the ADDR parameter, and since nginx does not use DNS to resolve the hostname, the NAME=[UNAVAILABLE] is specified. -If the xclient is disabled, -then the EHLO is issued upon the connection to the backend -if the client had passed it and the HELO -otherwise. +If xclient is disabled, +nginx will issue EHLO on a connection to the +backend if the client has passed it, or HELO, otherwise. diff -r fadccc156188 -r 95c3c3bbf1ce xml/en/docs/mail/ngx_mail_smtp_module.xml --- a/xml/en/docs/mail/ngx_mail_smtp_module.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/en/docs/mail/ngx_mail_smtp_module.xml Wed Aug 14 12:03:41 2013 +0400 @@ -56,23 +56,23 @@ server -Allows to specify the SMTP protocol extensions list -to be passed to the client in the response to the +Sets the SMTP protocol extensions list +that is passed to the client in response to the EHLO command. Authentication methods specified in the directive are automatically added to this list. -It makes sense to specify extensions -supported by MTA -to which clients are proxied (if this extensions are related to commands +It makes sense to specify the extensions +supported by the MTA +to which the clients are proxied (if these extensions are related to commands used after the authentication, when nginx transparently proxies the client connection to the backend). -The current list of standardized extensions is published at the +The current list of standardized extensions is published at www.iana.org. diff -r fadccc156188 -r 95c3c3bbf1ce xml/en/docs/mail/ngx_mail_ssl_module.xml --- a/xml/en/docs/mail/ngx_mail_ssl_module.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/en/docs/mail/ngx_mail_ssl_module.xml Wed Aug 14 12:03:41 2013 +0400 @@ -15,8 +15,8 @@

-The ngx_mail_ssl_module provides the necessary -support for mail proxy server for the SSL/TLS protocol. +The ngx_mail_ssl_module module provides the necessary +support for a mail proxy server to work with the SSL/TLS protocol. @@ -54,7 +54,7 @@ server -Specifies a file with a certificate in the PEM format for the given +Specifies a file with the certificate in the PEM format for the given server. If intermediate certificates should be specified in addition to a primary certificate, they should be specified in the same file in the following @@ -72,7 +72,7 @@ server -Specifies a file with a secret key in the PEM format for the given +Specifies a file with the secret key in the PEM format for the given server. @@ -87,7 +87,7 @@ Specifies that server ciphers should be preferred over client ciphers -when using the SSLv3 and TLS protocols. +when the SSLv3 and TLS protocols are used. @@ -106,13 +106,13 @@ Enables the specified protocols. -The parameters TLSv1.1 and TLSv1.2 work -only when using the OpenSSL library version 1.0.1 and higher. +The TLSv1.1 and TLSv1.2 parameters work +only when the OpenSSL library of version 1.0.1 or higher is used. -The parameters TLSv1.1 and TLSv1.2 are +The TLSv1.1 and TLSv1.2 parameters are supported starting from versions 1.1.13 and 1.0.12 -so when using OpenSSL version 1.0.1 -and higher on older nginx versions these protocols will work but could not +so when the OpenSSL version 1.0.1 or higher +is used on older nginx versions, these protocols work, but cannot be disabled. @@ -131,21 +131,21 @@ server -Sets types and sizes of caches that store session parameters. -A cache can be any of the following types: +Sets the types and sizes of caches that store session parameters. +A cache can be of any of the following types:

off

-the use of session cache is strictly prohibited: +the use of a session cache is strictly prohibited: nginx explicitly tells a client that sessions may not be reused.

none

builtin @@ -158,7 +158,7 @@ shared

-Allow usage of STLS command for the POP3 -and STARTTLS command for the IMAP; +allow usage of the STLS command for the POP3 +and the STARTTLS command for the IMAP;

off

-Deny usage of STLS +deny usage of the STLS and STARTTLS commands; diff -r fadccc156188 -r 95c3c3bbf1ce xml/en/docs/ngx_core_module.xml --- a/xml/en/docs/ngx_core_module.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/en/docs/ngx_core_module.xml Wed Aug 14 12:03:41 2013 +0400 @@ -563,7 +563,7 @@ (e.g. connections with proxied servers, among others), not only connections with clients. Another consideration is that the actual number of simultaneous -connections can not exceed the current limit on +connections cannot exceed the current limit on the maximum number of open files, which can be changed by .

diff -r fadccc156188 -r 95c3c3bbf1ce xml/ru/docs/control.xml --- a/xml/ru/docs/control.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/ru/docs/control.xml Wed Aug 14 12:03:41 2013 +0400 @@ -59,7 +59,7 @@

-Для того, чтобы nginx перечитал файл конфигурации, нужно послать +Для того чтобы nginx перечитал файл конфигурации, нужно послать главному процессу сигнал HUP. Главный процесс сначала проверяет синтаксическую правильность конфигурации, а затем пытается применить новую конфигурацию, то есть, открыть лог-файлы и новые listen сокеты. diff -r fadccc156188 -r 95c3c3bbf1ce xml/ru/docs/http/ngx_http_autoindex_module.xml --- a/xml/ru/docs/http/ngx_http_autoindex_module.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/ru/docs/http/ngx_http_autoindex_module.xml Wed Aug 14 12:03:41 2013 +0400 @@ -63,7 +63,7 @@ Определяет, как выводить размеры файлов в листинге -каталога — точно, или округляя до килобайт, мегабайт и гигабайт. +каталога: точно или округляя до килобайт, мегабайт и гигабайт. @@ -78,7 +78,7 @@ Определяет, в какой временной зоне выводить время в листинге -каталога — в локальной или в UTC. +каталога: в локальной или в UTC. diff -r fadccc156188 -r 95c3c3bbf1ce xml/ru/docs/http/ngx_http_core_module.xml --- a/xml/ru/docs/http/ngx_http_core_module.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/ru/docs/http/ngx_http_core_module.xml Wed Aug 14 12:03:41 2013 +0400 @@ -2599,7 +2599,7 @@ -Для того, чтобы для определённого location’а для всех ответов +Для того чтобы для определённого location’а для всех ответов выдавался MIME-тип “application/octet-stream”, можно использовать следующее: @@ -2885,7 +2885,7 @@ имя временного файла, в котором хранится тело запроса По завершении обработки файл необходимо удалить. -Для того, чтобы тело запроса всегда записывалось в файл, +Для того чтобы тело запроса всегда записывалось в файл, следует включить . При передаче имени временного файла в проксированном запросе или в запросе к FastCGI-серверу следует запретить передачу самого diff -r fadccc156188 -r 95c3c3bbf1ce xml/ru/docs/http/ngx_http_dav_module.xml --- a/xml/ru/docs/http/ngx_http_dav_module.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/ru/docs/http/ngx_http_dav_module.xml Wed Aug 14 12:03:41 2013 +0400 @@ -112,7 +112,8 @@ Файл, загружаемый методом PUT, записывается во временный файл, а потом этот файл переименовывается. Начиная с версии 0.8.9, временный файл и его постоянное место хранения -могут располагаться на разных файловых системах, но нужно учитывать, +могут располагаться на разных файловых системах. +Однако нужно учитывать, что в этом случае вместо дешёвой операции переименовывания в пределах одной файловой системы файл копируется с одной файловой системы на другую. Поэтому лучше, если сохраняемые файлы будут находиться на той же файловой diff -r fadccc156188 -r 95c3c3bbf1ce xml/ru/docs/http/ngx_http_fastcgi_module.xml --- a/xml/ru/docs/http/ngx_http_fastcgi_module.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/ru/docs/http/ngx_http_fastcgi_module.xml Wed Aug 14 12:03:41 2013 +0400 @@ -59,7 +59,7 @@ Специальное значение off (1.3.12) отменяет действие унаследованной с предыдущего уровня конфигурации директивы fastcgi_bind, позволяя системе -самостоятельно выбирать локальный адрес. +самостоятельно выбирать локальный IP-адрес. @@ -282,7 +282,8 @@ Кэшируемый ответ сначала записывается во временный файл, а потом этот файл переименовывается. Начиная с версии 0.8.9, временные файлы и кэш -могут располагаться на разных файловых системах, но нужно учитывать, +могут располагаться на разных файловых системах. +Однако нужно учитывать, что в этом случае вместо дешёвой операции переименовывания в пределах одной файловой системы файл копируется с одной файловой системы на другую. Поэтому лучше, если кэш будет находиться на той же файловой @@ -376,7 +377,7 @@ fastcgi_cache_valid 200 302 10m; fastcgi_cache_valid 404 1m; -задают время кэширования 10 минут для ответов с кодами 200 и 302, +задают время кэширования 10 минут для ответов с кодами 200 и 302 и 1 минуту для ответов с кодом 404. @@ -857,7 +858,7 @@ location -Если запрещено, то исходное тело запроса не будет передано +Позволяет запретить передачу исходного тела запроса на FastCGI-сервер. См. также директиву . @@ -873,7 +874,7 @@ location -Если запрещено, то поля заголовка исходного запроса не будут переданы на +Позволяет запретить передачу полей заголовка исходного запроса на FastCGI-сервер. См. также директивы . @@ -889,7 +890,7 @@ location -При установке в ненулевое значение nginx будет пытаться минимизировать +При установке директивы в ненулевое значение nginx будет пытаться минимизировать число операций отправки на исходящих соединениях с FastCGI-сервером либо при помощи флага NOTE_LOWAT метода , @@ -978,7 +979,8 @@ Ответ сначала записывается во временный файл, а потом этот файл переименовывается. Начиная с версии 0.8.9, временный файл и постоянное место хранения ответа -могут располагаться на разных файловых системах, но нужно учитывать, +могут располагаться на разных файловых системах. +Однако нужно учитывать, что в этом случае вместо дешёвой операции переименовывания в пределах одной файловой системы файл копируется с одной файловой системы на другую. Поэтому лучше, если сохраняемые файлы будут находиться на той же файловой diff -r fadccc156188 -r 95c3c3bbf1ce xml/ru/docs/http/ngx_http_gzip_module.xml --- a/xml/ru/docs/http/ngx_http_gzip_module.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/ru/docs/http/ngx_http_gzip_module.xml Wed Aug 14 12:03:41 2013 +0400 @@ -89,7 +89,7 @@ Устанавливает степень сжатия ответа методом gzip. -Допустимые значения находятся в диапазоне 1..9. +Допустимые значения находятся в диапазоне от 1 до 9. diff -r fadccc156188 -r 95c3c3bbf1ce xml/ru/docs/http/ngx_http_image_filter_module.xml --- a/xml/ru/docs/http/ngx_http_image_filter_module.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/ru/docs/http/ngx_http_image_filter_module.xml Wed Aug 14 12:03:41 2013 +0400 @@ -26,8 +26,7 @@ Для сборки и работы этого модуля необходима библиотека libgd. -Рекомендуется использовать самую последнюю версию библиотеки, -на текущий момент это версия 2.0.35. +Рекомендуется использовать самую последнюю версию библиотеки. @@ -195,7 +194,7 @@ Задаёт желаемое качество преобразованного изображения в формате JPEG. -Допустимые значения находятся в диапазоне 1..100. +Допустимые значения находятся в диапазоне от 1 до 100. Меньшим значениям обычно соответствует худшее качество изображения и меньший объём передаваемых данных. Максимальное рекомендуемое значение — 95. @@ -231,7 +230,7 @@ Определяет, сохранять ли прозрачность при обработке изображений -в формате PNG с цветами, заданными палитрой, и в формате GIF. +в формате GIF и в формате PNG с цветами, заданными палитрой. Потеря прозрачности позволяет получить более качественное изображение. Прозрачность альфа-канала в формате PNG сохраняется всегда. diff -r fadccc156188 -r 95c3c3bbf1ce xml/ru/docs/http/ngx_http_limit_conn_module.xml --- a/xml/ru/docs/http/ngx_http_limit_conn_module.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/ru/docs/http/ngx_http_limit_conn_module.xml Wed Aug 14 12:03:41 2013 +0400 @@ -16,12 +16,12 @@ Модуль ngx_http_limit_conn_module позволяет ограничить -число соединений по заданному ключу или, -как частный случай, число соединений с одного IP-адреса. +число соединений по заданному ключу, в частности, число соединений с одного +IP-адреса. -Ограничиваются не любые соединения, а лишь те, в которых имеются +Учитываются не все соединения, а лишь те, в которых имеются запросы, обрабатываемые сервером, и заголовок запроса уже прочитан. @@ -150,7 +150,7 @@ Задаёт параметры зоны разделяемой памяти, которая хранит состояние для разных значений ключа. -Состояние в частности хранит текущее число соединений. +Состояние в частности содержит текущее число соединений. Ключом является любое непустое значение заданной переменной (пустые значения не учитываются). Пример использования: @@ -162,13 +162,13 @@ использована переменная $binary_remote_addr. Длина значения переменной $remote_addr может колебаться от 7 до 15 байт, при этом размер хранимого состояния составляет -либо 32, либо 64 байта на 32-битных платформах, и всегда 64 +либо 32, либо 64 байта на 32-битных платформах и всегда 64 байта на 64-битных. Длина значения переменной $binary_remote_addr всегда равна 4 байтам, при этом размер состояния всегда равен 32 байтам на 32-битных платформах и 64 байтам на 64-битных. В зоне размером 1 мегабайт может разместиться около 32 тысяч состояний -размером 32 байта, или 16 тысяч состояний размером 64 байта. +размером 32 байта или 16 тысяч состояний размером 64 байта. При переполнении зоны в ответ на последующие запросы сервер будет возвращать ошибку . diff -r fadccc156188 -r 95c3c3bbf1ce xml/ru/docs/http/ngx_http_log_module.xml --- a/xml/ru/docs/http/ngx_http_log_module.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/ru/docs/http/ngx_http_log_module.xml Wed Aug 14 12:03:41 2013 +0400 @@ -112,7 +112,7 @@ записью в файл. Степень сжатия может быть задана в диапазоне от 1 (быстрее, но хуже сжатие) до 9 (медленнее, но лучше сжатие). -По умолчанию используется буфер размером 64К байт и степень сжатия 1. +По умолчанию используются буфер размером 64К байт и степень сжатия 1. Данные сжимаются атомарными блоками, и в любой момент времени лог-файл может быть распакован или прочитан с помощью утилиты “zcat”. diff -r fadccc156188 -r 95c3c3bbf1ce xml/ru/docs/http/ngx_http_memcached_module.xml --- a/xml/ru/docs/http/ngx_http_memcached_module.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/ru/docs/http/ngx_http_memcached_module.xml Wed Aug 14 12:03:41 2013 +0400 @@ -63,7 +63,7 @@ Специальное значение off (1.3.12) отменяет действие унаследованной с предыдущего уровня конфигурации директивы memcached_bind, позволяя системе -самостоятельно выбирать локальный адрес. +самостоятельно выбирать локальный IP-адрес. @@ -109,7 +109,7 @@ 1.3.6 -Включает проверку указанного флага в ответе +Включает проверку указанного флага в ответе сервера memcached и установку поля “Content-Encoding” заголовка ответа в “gzip”, если этот флаг установлен. diff -r fadccc156188 -r 95c3c3bbf1ce xml/ru/docs/http/ngx_http_mp4_module.xml --- a/xml/ru/docs/http/ngx_http_mp4_module.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/ru/docs/http/ngx_http_mp4_module.xml Wed Aug 14 12:03:41 2013 +0400 @@ -133,7 +133,7 @@ location -Задаёт начальный размер буфера памяти, используемого при обработке MP4 файлов. +Задаёт начальный размер буфера памяти, используемого при обработке MP4-файлов. @@ -147,11 +147,11 @@ location -В процессе обработки метаданных может понадобиться буфер большего размера. +В ходе обработки метаданных может понадобиться буфер большего размера. Его размер не может превышать указанного, -иначе nginx возвращает серверную ошибку +иначе nginx вернёт серверную ошибку -и протоколирует следующее: +и запишет в лог следующее сообщение: "/some/movie/file.mp4" mp4 moov atom is too large: 12583268, you may want to increase mp4_max_buffer_size diff -r fadccc156188 -r 95c3c3bbf1ce xml/ru/docs/http/ngx_http_perl_module.xml --- a/xml/ru/docs/http/ngx_http_perl_module.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/ru/docs/http/ngx_http_perl_module.xml Wed Aug 14 12:03:41 2013 +0400 @@ -39,11 +39,11 @@ -Для того, чтобы во время переконфигурации Perl перекомпилировал +Для того чтобы во время переконфигурации Perl перекомпилировал изменённые модули, его нужно собрать с параметрами -Dusemultiplicity=yes или -Dusethreads=yes. -Кроме того, чтобы во время работы Perl меньше терял память, +Кроме того, чтобы во время работы Perl терял меньше памяти, его нужно собрать с параметром -Dusemymalloc=no. Узнать значения этих параметров у уже собранного @@ -59,7 +59,7 @@ Необходимо учитывать, что после пересборки Perl с новыми параметрами -Dusemultiplicity=yes или -Dusethreads=yes -придётся также пересобрать и все бинарные модули Perl — они +придётся также пересобрать и все бинарные модули Perl, так как они просто перестанут работать с новым Perl. @@ -89,8 +89,8 @@ имеют только текстовое значение, причём само значение хранится в памяти, выделяемой не Perl, а nginx из собственных пулов. Это позволяет уменьшить число операций копирования в большинстве случаев, -однако в некоторых ситуациях это приводит к ошибке, -например, при попытке использования таких значений в численном контексте +однако в некоторых ситуациях это приводит к ошибке. +Например, при попытке использования таких значений в числовом контексте рабочий процесс выходит с ошибкой (FreeBSD): nginx in realloc(): warning: pointer to wrong page @@ -103,7 +103,7 @@ Out of memory! Callback called exit. -Обход такой ситуации простой — нужно присвоить значение метода +Обойти такую ситуацию просто: нужно присвоить значение метода переменной, например, такой код my $i = $r->variable('counter') + 1; @@ -117,14 +117,14 @@ Так как строки внутри nginx в большинстве случаев хранятся без -завершающего нуля, то они в таком же виде возвращаются методами +завершающего нуля, то они в таком же виде возвращаются и методами объекта запроса $r (исключения составляют методы $r->filename и $r->request_body_file). Поэтому такие значения нельзя использовать -в качестве имени файла и тому подобном. -Обход такой же, как и предыдущей ситуации — присвоение значения +в качестве имени файла и тому подобного. +Обойти это можно так же, как в предыдущей ситуации: присвоив значение переменной (при этом происходит копирование данных и добавление необходимого -нуля) или же использование в выражении, например: +нуля) или же использовав его в выражении, например: open FILE, '/path/' . $r->variable('name'); @@ -285,7 +285,7 @@ возвращает 0, если в запросе нет тела. -Если же тело запроса есть, то устанавливается +Если же в запросе есть тело, то устанавливается указанный обработчик и возвращается 1. По окончании чтения тела запроса nginx вызовет установленный обработчик. Обратите внимание, что нужно передавать ссылку на функцию обработчика. @@ -383,7 +383,7 @@ возвращает тело запроса клиента при условии, что тело не записано во временный файл. -Для того, чтобы тело запроса клиента гарантированно находилось в памяти, +Для того чтобы тело запроса клиента гарантированно находилось в памяти, нужно ограничить его размер с помощью и задать достаточной размер для буфера @@ -394,7 +394,7 @@ возвращает имя файла, в котором хранится тело запроса клиента. По завершению обработки файл необходимо удалить. -Для того, чтобы тело запроса клиента всегда записывалось в файл, +Для того чтобы тело запроса клиента всегда записывалось в файл, следует включить . diff -r fadccc156188 -r 95c3c3bbf1ce xml/ru/docs/http/ngx_http_proxy_module.xml --- a/xml/ru/docs/http/ngx_http_proxy_module.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/ru/docs/http/ngx_http_proxy_module.xml Wed Aug 14 12:03:41 2013 +0400 @@ -323,7 +323,8 @@ Кэшируемый ответ сначала записывается во временный файл, а потом этот файл переименовывается. Начиная с версии 0.8.9, временные файлы и кэш -могут располагаться на разных файловых системах, но нужно учитывать, +могут располагаться на разных файловых системах. +Однако нужно учитывать, что в этом случае вместо дешёвой операции переименовывания в пределах одной файловой системы файл копируется с одной файловой системы на другую. Поэтому лучше, если кэш будет находиться на той же файловой @@ -420,7 +421,7 @@ proxy_cache_valid 200 302 10m; proxy_cache_valid 404 1m; -задают время кэширования 10 минут для ответов с кодами 200 и 302, +задают время кэширования 10 минут для ответов с кодами 200 и 302 и 1 минуту для ответов с кодом 404. @@ -1249,7 +1250,7 @@ location -При установке в ненулевое значение nginx будет пытаться минимизировать +При установке директивы в ненулевое значение nginx будет пытаться минимизировать число операций отправки на исходящих соединениях с проксируемым сервером либо при помощи флага NOTE_LOWAT метода , @@ -1402,7 +1403,8 @@ Ответ сначала записывается во временный файл, а потом этот файл переименовывается. Начиная с версии 0.8.9, временный файл и постоянное место хранения ответа -могут располагаться на разных файловых системах, но нужно учитывать, +могут располагаться на разных файловых системах. +Однако нужно учитывать, что в этом случае вместо дешёвой операции переименовывания в пределах одной файловой системы файл копируется с одной файловой системы на другую. Поэтому лучше, если сохраняемые файлы будут находиться на той же файловой diff -r fadccc156188 -r 95c3c3bbf1ce xml/ru/docs/http/ngx_http_random_index_module.xml --- a/xml/ru/docs/http/ngx_http_random_index_module.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/ru/docs/http/ngx_http_random_index_module.xml Wed Aug 14 12:03:41 2013 +0400 @@ -18,7 +18,7 @@ Модуль ngx_http_random_index_module обслуживает запросы, оканчивающиеся слэшом (‘/’), и выдаёт случайный файл в качестве индексного файла каталога. -Модуль работает до модуля +Модуль выполняется до модуля ngx_http_index_module. diff -r fadccc156188 -r 95c3c3bbf1ce xml/ru/docs/http/ngx_http_rewrite_module.xml --- a/xml/ru/docs/http/ngx_http_rewrite_module.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/ru/docs/http/ngx_http_rewrite_module.xml Wed Aug 14 12:03:41 2013 +0400 @@ -199,7 +199,7 @@ В тексте тела ответа и URL перенаправления можно использовать переменные. Как частный случай, URL перенаправления может быть задан как URI, локальный для данного сервера, при этом полный URL перенаправления -формируется согласно схеме запроса ($scheme) и директив +формируется согласно схеме запроса ($scheme) и директивам и . diff -r fadccc156188 -r 95c3c3bbf1ce xml/ru/docs/http/ngx_http_ssl_module.xml --- a/xml/ru/docs/http/ngx_http_ssl_module.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/ru/docs/http/ngx_http_ssl_module.xml Wed Aug 14 12:03:41 2013 +0400 @@ -308,7 +308,7 @@ мягкое запрещение использования кэша сессий: nginx говорит клиенту, что сессии могут использоваться повторно, но -на самом деле не используются. +на самом деле не хранит параметры сессии в кэше. builtin @@ -321,7 +321,7 @@ shared

-разделяемый между всеми рабочими процессами. +кэш, разделяемый между всеми рабочими процессами. Размер кэша задаётся в байтах, в 1 мегабайт может поместиться около 4000 сессий. У каждого разделяемого кэша должно быть произвольное название. @@ -557,7 +557,7 @@ Перенаправление делается после того, как запрос полностью разобран и доступны такие переменные, как $request_uri, -$uri, $args и прочие. +$uri, $args и другие переменные.

diff -r fadccc156188 -r 95c3c3bbf1ce xml/ru/docs/http/ngx_http_sub_module.xml --- a/xml/ru/docs/http/ngx_http_sub_module.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/ru/docs/http/ngx_http_sub_module.xml Wed Aug 14 12:03:41 2013 +0400 @@ -91,8 +91,8 @@ location -Определяет, сколько раз нужно искать заменяемую строку — один -раз или несколько. +Определяет, сколько раз нужно искать заменяемую строку: один +раз или несколько раз. diff -r fadccc156188 -r 95c3c3bbf1ce xml/ru/docs/http/ngx_http_upstream_module.xml --- a/xml/ru/docs/http/ngx_http_upstream_module.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/ru/docs/http/ngx_http_upstream_module.xml Wed Aug 14 12:03:41 2013 +0400 @@ -81,8 +81,8 @@ В вышеприведённом примере каждые 7 запросов будут распределены так: 5 запросов на backend1.example.com и по одному запросу на второй и третий серверы. -Если при попытке работы с сервером произошла ошибка, то запрос будет -передан следующему серверу, и так до тех пор, пока не будут опробованы +Если при попытке работы с сервером происходит ошибка, то запрос +передаётся следующему серверу, и так далее до тех пор, пока не будут опробованы все работающие серверы. Если не удастся получить успешный ответ ни от одного из серверов, то клиенту будет возвращён результат работы @@ -119,12 +119,12 @@ max_fails=число

-задаёт число неудачных попыток работы с сервером -в течение времени, заданного параметром fail_timeout, -после которого он считается неработающим, также в течение времени -заданного параметром fail_timeout. +задаёт число неудачных попыток работы с сервером, которые должны произойти +в промежуток времени, заданный параметром fail_timeout, +чтобы сервер считался неработающим на период времени, также заданный +параметром fail_timeout. По умолчанию число попыток устанавливается равным 1. -Нулевое значение запрещает учёт попыток. +Нулевое значение отключает учёт попыток. Что считается неудачной попыткой, определяется директивами , и @@ -146,7 +146,7 @@ -По умолчанию таймаут равен 10 секундам. +По умолчанию параметр равен 10 секундам.

backup @@ -250,9 +250,9 @@ Следует особо отметить, что директива keepalive не ограничивает общее число соединений с серверами группы, которые рабочие процессы nginx могут открыть. -Параметр соединения следует устанавливать -достаточно консервативно для обеспечения возможности -обработки серверами группы новых входящих соединений. +Параметр соединения следует устанавливать достаточно +консервативно, чтобы серверы группы по-прежнему могли обрабатывать +новые входящие соединения. @@ -306,7 +306,7 @@ Хоть это и не рекомендуется, но также возможно использование постоянных -соединений в HTTP/1.0, путём передачи поля заголовка +соединений с HTTP/1.0, путём передачи поля заголовка

Connection: Keep-Alive

серверу группы. @@ -386,7 +386,8 @@ с помощью

X-Accel-Redirect

или , -то эти группы серверов разделяются двоеточием, например, +то адреса, соответствующие разным группам серверов, разделяются двоеточием, +например, “192.168.1.1:80, 192.168.1.2:80, unix:/tmp/sock : 192.168.10.1:80, 192.168.10.2:80”. @@ -403,23 +404,23 @@ хранит длины ответов, полученных от серверов группы (0.7.27); длины хранятся в байтах. -Несколько ответов разделяются запятыми и двоеточиями, -подобно переменной $upstream_addr. +Длины нескольких ответов разделяются запятыми и двоеточиями +подобно адресам в переменной $upstream_addr.

$upstream_response_time

хранит времена ответов, полученных от серверов группы; времена хранятся в секундах с точностью до миллисекунд. -Несколько ответов разделяются запятыми и двоеточиями, -подобно переменной $upstream_addr. +Времена нескольких ответов разделяются запятыми и двоеточиями +подобно адресам в переменной $upstream_addr.

$upstream_status

хранит коды ответов, полученных от серверов группы. -Несколько ответов разделяются запятыми и двоеточиями, -подобно переменной $upstream_addr. +Коды нескольких ответов разделяются запятыми и двоеточиями +подобно адресам в переменной $upstream_addr.

$upstream_http_... @@ -430,7 +431,7 @@ Правила преобразования имён полей заголовка ответа в имена переменных такие же, как для переменных с префиксом “$http_”. -Необходимо иметь в виду, что запоминаются только поля заголовка ответа +Необходимо иметь в виду, что запоминаются поля заголовка только из ответа последнего сервера. diff -r fadccc156188 -r 95c3c3bbf1ce xml/ru/docs/http/ngx_http_userid_module.xml --- a/xml/ru/docs/http/ngx_http_userid_module.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/ru/docs/http/ngx_http_userid_module.xml Wed Aug 14 12:03:41 2013 +0400 @@ -212,8 +212,8 @@ то каждому сервису следует назначить свой собственный номер, для обеспечения уникальности выдаваемых идентификаторов клиентов. По умолчанию для кук первой версии используется ноль. -Для кук второй версии это число, составленное из последних четырёх -октетов IP-адреса сервера. +Для кук второй версии по умолчанию используется число, составленное из +последних четырёх октетов IP-адреса сервера. diff -r fadccc156188 -r 95c3c3bbf1ce xml/ru/docs/http/ngx_http_xslt_module.xml --- a/xml/ru/docs/http/ngx_http_xslt_module.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/ru/docs/http/ngx_http_xslt_module.xml Wed Aug 14 12:03:41 2013 +0400 @@ -163,7 +163,7 @@ в одной строке, разделяя символом “:”. Если же в самих параметрах встречается символ “:”, то его нужно экранировать в виде “%3A”. -Кроме того, необходимо помнить о требовании libxslt, +Кроме того, libxslt требует, чтобы параметры, содержащие не только алфавитно-цифровые символы, были заключены в одинарные или двойные кавычки, например: diff -r fadccc156188 -r 95c3c3bbf1ce xml/ru/docs/mail/ngx_mail_auth_http_module.xml --- a/xml/ru/docs/mail/ngx_mail_auth_http_module.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/ru/docs/mail/ngx_mail_auth_http_module.xml Wed Aug 14 12:03:41 2013 +0400 @@ -35,8 +35,8 @@ server -Позволяет добавить указанный заголовок к запросам на сервер аутентификации. -Можно использовать в качестве shared secret для проверки, +Добавляет указанный заголовок к запросам на сервер аутентификации. +Заголовок можно использовать в качестве shared secret для проверки, что запрос поступил от nginx. Например: @@ -137,7 +137,7 @@ Для SMTP в ответе дополнительно учитывается заголовок

Auth-Error-Code

— если он есть, то используется как код ответа в случае ошибки. -Если нет, то по умолчанию к

Auth-Status

+Если его нет, то по умолчанию к

Auth-Status

будет добавлен код 535 5.7.0. diff -r fadccc156188 -r 95c3c3bbf1ce xml/ru/docs/mail/ngx_mail_core_module.xml --- a/xml/ru/docs/mail/ngx_mail_core_module.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/ru/docs/mail/ngx_mail_core_module.xml Wed Aug 14 12:03:41 2013 +0400 @@ -106,9 +106,9 @@ адрес:порт нужно делать bind отдельно. Дело в том, что если описаны несколько директив listen -с одинаковым портом, но разными адресами и одна из директив +с одинаковым портом, но разными адресами, и одна из директив listen слушает на всех адресах для данного порта -(*:порт, то nginx сделает +(*:порт), то nginx сделает bind только на *:порт. Необходимо заметить, что в этом случае для определения адреса, на которой пришло соединение, делается системный вызов getsockname. diff -r fadccc156188 -r 95c3c3bbf1ce xml/ru/docs/mail/ngx_mail_proxy_module.xml --- a/xml/ru/docs/mail/ngx_mail_proxy_module.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/ru/docs/mail/ngx_mail_proxy_module.xml Wed Aug 14 12:03:41 2013 +0400 @@ -57,8 +57,9 @@ Обычно, если аутентификация в nginx прошла успешно, -бэкенд не может вернуть ошибку, и если она всё же есть, -значит есть какая-то ошибка внутри системы. +бэкенд не может вернуть ошибку. +Если же он всё-таки возвращает ошибку, +это значит, что произошла ошибка внутри системы. В таких случаях сообщение бэкенда может содержать информацию, которую нельзя показывать клиенту. Однако для некоторых POP3-серверов ошибка в ответ на правильный пароль diff -r fadccc156188 -r 95c3c3bbf1ce xml/ru/docs/mail/ngx_mail_ssl_module.xml --- a/xml/ru/docs/mail/ngx_mail_ssl_module.xml Wed Aug 14 17:21:19 2013 +0400 +++ b/xml/ru/docs/mail/ngx_mail_ssl_module.xml Wed Aug 14 12:03:41 2013 +0400 @@ -145,7 +145,7 @@ мягкое запрещение использования кэша сессий: nginx говорит клиенту, что сессии могут использоваться повторно, но -на самом деле не используются. +на самом деле не хранит параметры сессии в кэше. builtin @@ -158,7 +158,7 @@ shared