# HG changeset patch # User Ruslan Ermilov # Date 1375360262 -14400 # Node ID aded7086e84f83b353af697ad92e9bd0babe7425 # Parent 417dc982362e1e1144fab247aec0ccbd5538fa1f Commercial version documentation. diff -r 417dc982362e -r aded7086e84f dtd/content.dtd --- a/dtd/content.dtd Wed Jul 31 23:46:04 2013 +0400 +++ b/dtd/content.dtd Thu Aug 01 16:31:02 2013 +0400 @@ -13,7 +13,8 @@ @@ -30,7 +31,8 @@ - + @@ -47,7 +49,7 @@ > + mainline_version | stable_version | commercial_version)* > @@ -59,7 +61,8 @@ + link | registered | + mainline_version | stable_version | commercial_version)* > @@ -67,7 +70,7 @@ + mainline_version | stable_version | commercial_version)* > - - + + + + list | literal | note | path | value | var | + mainline_version | stable_version | commercial_version)* > @@ -95,3 +96,7 @@ + + + + diff -r 417dc982362e -r aded7086e84f xml/en/GNUmakefile --- a/xml/en/GNUmakefile Wed Jul 31 23:46:04 2013 +0400 +++ b/xml/en/GNUmakefile Thu Aug 01 16:31:02 2013 +0400 @@ -42,6 +42,7 @@ http/ngx_http_dav_module \ http/ngx_http_empty_gif_module \ http/ngx_http_fastcgi_module \ + http/ngx_http_f4f_module \ http/ngx_http_flv_module \ http/ngx_http_geo_module \ http/ngx_http_geoip_module \ @@ -49,6 +50,7 @@ http/ngx_http_gzip_module \ http/ngx_http_gzip_static_module \ http/ngx_http_headers_module \ + http/ngx_http_hls_module \ http/ngx_http_image_filter_module \ http/ngx_http_index_module \ http/ngx_http_limit_conn_module \ @@ -65,9 +67,11 @@ http/ngx_http_rewrite_module \ http/ngx_http_secure_link_module \ http/ngx_http_spdy_module \ + http/ngx_http_session_log_module \ http/ngx_http_split_clients_module \ http/ngx_http_ssi_module \ http/ngx_http_ssl_module \ + http/ngx_http_status_module \ http/ngx_http_sub_module \ http/ngx_http_upstream_module \ http/ngx_http_userid_module \ diff -r 417dc982362e -r aded7086e84f xml/en/docs/http/ngx_http_f4f_module.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/xml/en/docs/http/ngx_http_f4f_module.xml Thu Aug 01 16:31:02 2013 +0400 @@ -0,0 +1,87 @@ + + + + + + + + +
+ + +The module ngx_http_f4f_module provides +server-side support for Adobe HTTP Dynamic Streaming (HDS). + + + +This module implements handling of HTTP Dynamic Streaming requests in a +“/videoSeg1-Frag1” form, extracting needed fragment +from the videoSeg1.f4f file using the videoSeg1.f4x +index file. +This module is an alternative to the Adobe’s f4f module (HTTP Origin Module) +for Apache. + + + +Usual pre-processing with Adobe’s f4fpackager is required, see relevant +documentation for details. + + + + +This module is available as part of our only. + + + +
+ + +
+ + + +location /video/ { + f4f; + ... +} + + + +
+ + +
+ + + + +location + + +Turns on module processing in a surrounding location. + + + + + + +size +512k +http +server +location + + +Sets the size of a memory buffer used for reading .f4x index file. + + + + +
+ + diff -r 417dc982362e -r aded7086e84f xml/en/docs/http/ngx_http_hls_module.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/xml/en/docs/http/ngx_http_hls_module.xml Thu Aug 01 16:31:02 2013 +0400 @@ -0,0 +1,156 @@ + + + + + + + + +
+ + +The module ngx_http_hls_module provides HTTP Live Streaming +(HLS) server-side support for H.264/AAC files typically having filename +extensions .mp4, .m4v, and .m4a. + + + +Two URIs are supported for each MP4 file: + + + +The playlist URI that ends with “.m3u8” and accepts +the optional “len” argument that defines fragment length +in seconds; + + + +The fragment URI that ends with “.ts” and accepts +“start” and “end” arguments that +define fragment boundaries in seconds. + + + + + + + +This module is available as part of our only. + + + +
+ + +
+ + + +location /video/ { + hls; + hls_fragment 5s; + hls_buffers 10 10m; + hls_mp4_buffer_size 1m; + hls_mp4_max_buffer_size 5m; + alias /var/video/; +} + +For example, the following URIs are supported for +the “/var/video/test.mp4” file: + +http://hls.example.com/video/test.mp4.m3u8?len=8.000 +http://hls.example.com/video/test.mp4.ts?start=1.000&end=2.200 + + + +
+ + +
+ + + + +location + + +Turns on HLS streaming in a surrounding location. + + + + + + +number size +8 2m +http +server +location + + +Sets the maximum number and size of buffers +for reading and writing data frames. + + + + + + +time +5s +http +server +location + + +Defines fragment length for playlist URIs requested without the +“len” argument. + + + + + + +size +512k +http +server +location + + +Sets the initial size of a memory buffer used to +process MP4 files. + + + + + + +size +10m +http +server +location + + +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: + +"/some/movie/file.mp4" mp4 moov atom is too large: +12583268, you may want to increase hls_mp4_max_buffer_size + + + + + +
+ + diff -r 417dc982362e -r aded7086e84f xml/en/docs/http/ngx_http_log_module.xml --- a/xml/en/docs/http/ngx_http_log_module.xml Wed Jul 31 23:46:04 2013 +0400 +++ b/xml/en/docs/http/ngx_http_log_module.xml Thu Aug 01 16:31:02 2013 +0400 @@ -10,7 +10,7 @@ + rev="10">
@@ -58,6 +58,9 @@ gzip[=level] [buffer=size] [flush=time] + + syslog:server=address[,parameter=value] + [format] off logs/access.log combined http @@ -69,6 +72,8 @@ Sets the path, format, and configuration of the buffered log writes. 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 @@ -174,6 +179,75 @@ + +The following parameters configure logging to syslog: + + +server=address + +Defines an address of a syslog server. +An address can be specified as a domain name or IP address, +and an optional port, or as a UNIX-domain socket path +specified after the “unix:” prefix. +If port is not specified, the port 514 is used. +If a domain name resolves to several IP addresses, the first resolved +address is used. + + +facility=string + +Sets facility of syslog messages, as defined in +RFC 3164. +Facility can be one of “kern”, “user”, +“mail”, “daemon”, +“auth”, “intern”, +“lpr”, “news”, “uucp”, +“clock”, “authpriv”, +“ftp”, “ntp”, “audit”, +“alert”, “cron”, +“local0”..“local7”. +Default is “local7”. + + +severity=string + +Sets severity of syslog messages, as defined in +RFC 3164. +Possible values are the same as for the second parameter (level) of the + directive. +Default is “info”. + + +tag=string + +Sets tag of syslog messages. +Default is “nginx”. + + + + + +Example syslog configuration: + +access_log syslog:server=192.168.1.1; +access_log syslog:server=unix:/var/log/nginx.sock; +access_log syslog:server=[2001:db8::1]:12345,facility=local7,tag=nginx,severity=info combined; + + + + + +Logging to syslog is available as part of our only. + + + diff -r 417dc982362e -r aded7086e84f xml/en/docs/http/ngx_http_mp4_module.xml --- a/xml/en/docs/http/ngx_http_mp4_module.xml Wed Jul 31 23:46:04 2013 +0400 +++ b/xml/en/docs/http/ngx_http_mp4_module.xml Thu Aug 01 16:31:02 2013 +0400 @@ -9,7 +9,7 @@ + rev="2">
@@ -100,8 +100,10 @@ location /video/ { mp4; - mp4_buffer_size 1m; - mp4_max_buffer_size 5m; + mp4_buffer_size 1m; + mp4_max_buffer_size 5m; + mp4_limit_rate on; + mp4_limit_rate_after 30s; } @@ -158,6 +160,53 @@ + + + + on | + off | + factor +off +http +server +location + + +Enables or disables rate limiting based on an average bitrate of the +MP4 file served. +To calculate the rate, bitrate is multiplied by the specified +factor. +The special value “on” corresponds to a factor of 1.1. + + + + +This directive is available as part of our only. + + + + + + + +time +1m +http +server +location + + +Limits rate after sending the specified amount of media data. + + + + +This directive is available as part of our only. + + + + +
diff -r 417dc982362e -r aded7086e84f xml/en/docs/http/ngx_http_session_log_module.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/xml/en/docs/http/ngx_http_session_log_module.xml Thu Aug 01 16:31:02 2013 +0400 @@ -0,0 +1,155 @@ + + + + + + + + +
+ + +The module ngx_http_session_log_module allows to log +sessions (i.e. aggregates of multiple HTTP requests) instead of +individual HTTP requests. + + + + +This module is available as part of our only. + + + +
+ + +
+ + +Log sessions based on client address and
User-Agent
+request header field: + + session_log_zone /path/to/log format=combined + zone=one:1m timeout=30s + md5=$binary_remote_addr$http_user_agent; + + location /media/ { + session_log one; + } + + + +
+ + +
+ + + + name + string ... +combined "..." +http + + +Specifies format of a log. +Value of the $body_bytes_sent variable is aggregated across +all requests in the session. +Everything else corresponds to the first request that started a session. + + + + + + + + path + zone=name:size + [format=format] + [timeout=time] + [id=id] + [md5=md5] + + +http + + +Sets path to log file and shared memory zone used to store currently active +sessions. + + + +Sessions are considered active for as long as the time elapsed since +the last request in the session does not exceed a specified +timeout (by default, 30 seconds). +Session is logged once it is no longer active. + + + +Requests are mapped into sessions based on the value of the +id parameter. +If id is not specified or does not represent the valid +MD5 hash, a new session is created using MD5 hash computed from the value +of the md5 parameter. +Both id and md5 parameters +can contain variables. + + + +The format parameter can be used to set custom session log +format. +If format is not specified then the predefined format +“combined” is used. + + + + + + +name | off +off +http +server +location + + +Use the specified session log. +The special value off cancels all +session_log directives inherited from the previous +configuration level. + + + + +
+ + +
+ + +The ngx_http_session_log_module module supports +two embedded variables: + + + +$session_log_id + +current session ID; + + +$session_log_binary_id + +current session ID in binary form (16 bytes). + + + + + +
+ + diff -r 417dc982362e -r aded7086e84f xml/en/docs/http/ngx_http_status_module.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/xml/en/docs/http/ngx_http_status_module.xml Thu Aug 01 16:31:02 2013 +0400 @@ -0,0 +1,314 @@ + + + + + + + + +
+ + +The module ngx_http_status_module provides +access to various status information. + + + + +This module is available as part of our only. + + + +
+ + +
+ + + +location = /status { + status; +} + + + + +The simple monitoring page is shipped with this distribution, +accessible as “/status.html” in the default configuration. +It requires the location “/status” to be configured +as shown above. + + +
+ + +
+ + + + +location + + +The status information will be accessible from the surrounding location. + + + + + + +json +jsonp [callback] +json +http +server +location + + +By default, status information is output in the JSON format. + + + +Alternatively, data may be output as JSONP. +The callback parameter specifies the name of a callback function. +The value can contain variables. +If parameter is omitted, or the computed value is an empty string, +then “ngx_status_jsonp_callback” is used. + + + + +
+ + +
+ + +The following status information is provided: + + +version + +Version of the provided data set. +The current version is 1. + + +nginx_version + +Version of nginx. + + +address + +An address of the server that accepted status request. + + +timestamp + +Current time in milliseconds since Epoch. + + +connections + + + +accepted + +The total number of accepted client connections. + + +dropped + +The total number of dropped client connections. + + +active + +The current number of active client connections. + + +idle + +The current number of idle client connections. + + + + + +requests + + + +total + +The total number of client requests. + + +current + +The current number of client requests. + + + + + +upstreams + +For each + +in the +dynamically +configurable +group, +the following data are provided: + + +server + +An address of the +. + + +weight + +Weight of the +. + + +state + +Current state, which may be one of +“up”, +“down”, +“unavail”, +or +“unhealthy”. + + +active + +The current number of active connections. + + +keepalive + +The current number of +idle connections. + + +requests + +The total number of +client requests forwarded to this server. + + +responses + + + +total + +The total number of +responses obtained from this server. + + + +1xx, +2xx, +3xx, +4xx, +5xx + + +The number of responses with status codes 1xx, 2xx, 3xx, 4xx, and 5xx. + + + + + +sent + +The total bytes sent to this server. + + +received + +The total bytes received from this server. + + +fails + +The total number of +unsuccessful attempts to communicate with the server. + + +unavail + +How many times +the server became unavailable for client requests +(state “unavail”) +due to the number of unsuccessful attempts reaching +the max_fails threshold. + + +health_checks + + + +checks + +The total number of +health check +requests made. + + +fails + +The number of failed health checks. + + +unhealthy + +How many times +the server became unhealthy (state “unhealthy”). + + +last_passed + +Boolean indicating +if the last health check request was successful and passed +tests. + + + + + + + + +downtime + +Total time +the server was in the “unavail” +and “unhealthy” states. + + +downstart + +The time (in milliseconds since Epoch) +when the server became +“unavail” +or “unhealthy”. + + + + + +
+ + diff -r 417dc982362e -r aded7086e84f xml/en/docs/http/ngx_http_upstream_module.xml --- a/xml/en/docs/http/ngx_http_upstream_module.xml Wed Jul 31 23:46:04 2013 +0400 +++ b/xml/en/docs/http/ngx_http_upstream_module.xml Thu Aug 01 16:31:02 2013 +0400 @@ -10,7 +10,7 @@ + rev="5">
@@ -46,6 +46,36 @@ + +Dynamically configurable group, +available as part of our only: + +upstream appservers { + zone appservers 64k; + + server appserv1.example.com weight=5; + server appserv2.example.com:8080 fail_timeout=5s; + server 192.0.2.1 max_fails=3; + + server reserve1.example.com:8080 backup; + server reserve2.example.com:8080 backup; +} + +server { + location / { + proxy_pass http://appservers; + health_check; + } + + location /upstream_conf { + upstream_conf; + allow 127.0.0.1; + deny all; + } +} + + +
@@ -180,6 +210,30 @@ + +name size + +upstream + + +Makes the group dynamically configurable. +Defines the name and size of a shared +memory zone that keeps group’s configuration and run-time state that are +shared between worker processes. +Such groups allow to add, remove, and modify servers at run time. +The configuration is accessible via a special location handled by +. + + + + +This directive is available as part of our only. + + + + + + @@ -364,6 +418,640 @@ + + + + [interval=time] + + [fails=number] + [passes=number] + [uri=uri] + [match=name] + + +location + + +Enables periodic health checks of servers in a +group referenced in the surrounding location. + + + +The following optional parameters are supported: + + + +interval +sets interval between two consecutive health checks, +defaults to five seconds; + + + +fails +sets a number of consecutive failed health checks +after which the server will be considered unhealthy, +defaults to 1; + + + +passes +sets a number of consecutive passed health checks +after which the server will be considered healthy, +defaults to 1; + + + +uri +defines the URI used in health check requests, +defaults to “/”; + + + +match +names tests that a response should +pass in order for a health check to pass, +defaults to responses with status codes 2xx and 3xx. + + + + + + +For example, + +location / { + proxy_pass http://backend; + health_check; +} + +will send “/” requests to each +server in the group backend every five seconds. +If any communication errors or timeouts occur, or if a +proxied server responds with the status code other than +2xx or 3xx, health check will fail, and the server will +become unhealthy. +Client requests will not be passed to unhealthy servers. + + + +Health checks can be configured to test status code of a response, +presence of certain header fields and their values, +and/or the body contents. +Tests are configured separately with the directives +and referenced in the match parameter. +For example, + +http { + server { + ... + location / { + proxy_pass http://backend; + health_check match=welcome; + } + } + + match welcome { + status 200; + header Content-Type = text/html; + body ~ "Welcome to nginx!"; + } +} + +tells that for a health check to pass, a response should succeed, +have status 200, content type “text/html”, +and contain “Welcome to nginx!” in the body. + + + +It is required that a group be in shared memory. + + + +If several health checks are defined for the same group of servers, +a single failure of any check will make the corresponding server +to become unhealthy. + + + + +This directive is available as part of our only. + + + + + + + +name + +http + + +Defines the named test set used to verify responses to health check requests. + + + +The following can be tested in a response: + + +status 200; +status is 200 + +status ! 500; +status is not 500 + +status 200 204; +status is 200 or 204 + +status ! 301 302; +status is neither 301 nor 302 + +status 200-399; +status is in the 200..399 range + +status ! 400-599; +status is not in the 400..599 range + +status 301-303 307; +status is one of 301, 302, 303, or 307 + + + + + +header Content-Type = text/html; + +header contains
Content-Type
+with value text/html + + +header Content-Type != text/html; + +header contains
Content-Type
+with value other than text/html + + +header Connection ~ close; + +header contains
Connection
+with value matching regular expression close + + +header Connection !~ close; + +header contains
Connection
+with value not matching regular expression close + + +header Host; +header contains
Host
 + +header ! X-Accel-Redirect; +header lacks
X-Accel-Redirect
 + + + + + +body ~ "Welcome to nginx!"; + +body matches regular expression “Welcome to nginx!” + + +body !~ "Welcome to nginx!"; + +body does not match regular expression “Welcome to nginx!” + + + + + + +If several tests are specified, +the response matches only if it passes all tests. + +Only the first 256k of body are examined. + + + + +Examples: + +# status is 200, content type is "text/html", +# and body contains "Welcome to nginx!" +match welcome { + status 200; + header Content-Type = text/html; + body ~ "Welcome to nginx!"; +} + + + +# status is not one of 301, 302, 303, or 307, and header does not have "Refresh:" +match not_redirect { + status ! 301-303 307; + header ! Refresh; +} + + + +# status ok and not in maintenance mode +match server_ok { + status 200-399; + body !~ "maintenance mode"; +} + + + + + + +This directive is available as part of our only. + + + + + + + + + +upstream + + +Enables session affinity support. +The session is an object that is used to uniquely identify and maintain the +state of a client during a given period of time. +If session affinity is enabled, a client’s requests are always passed to the +same server (in a group of servers) once a session has been created. +Method used to create and track sessions must be specified by a separate +directive, for example, . + +upstream backend { + server backend1.example.com; + server backend2.example.com; + + sticky; + sticky_cookie_insert "sticky"; +} + +server { + location / { + proxy_pass http://backend; + } +} + +The directive must be specified after the or the + directives. + + + +Requests are processed as follows with the session affinity enabled: + + + +The lookup of session corresponding to request is performed. +If the session is found, server identification data is extracted from it. +This data is used by the server selection algorithm. + + + +The server to process the request is chosen according to the configured +balancing method, server information from session and the real state of +servers in a group (up or down, failed, etc.). + + + +The request is passed to the chosen server for processing. +If the chosen server does not match specified in the session +(due to being down, for example), the session is cleared +and the request is processed as it had no session. + + + +The server returns the response. + + + +If there was no session for the request, new session +is created and server identification data is stored in it. + + + + + + + +This directive is available as part of our only. + + + + + + + +name +[expires=time] +[domain=host] +[path=path] + +upstream + + +Enables and configures the session tracking method, based on keeping +session information in HTTP cookies. +The directive must be specified after the or the + directives. +Example: + +sticky_cookie_insert "srv_id" "expires=1h 7m" domain=example.com path=/; + +The first parameter sets the name of the cookie to be inserted or inspected. +Additional parameters may be as follows: + + +expires + +Sets a time during which a browser should keep the cookie. +The parameter “max” sets the time to +“31 Dec 2037 23:55:55 GMT”. +This is the maximum time understood by old browsers. + + +domain + +Defines a domain for which the cookie is set. + + +path + +Defines a path for which the cookie is set. + + + +If some parameter is omitted, then the corresponding cookie field is not set. + + + + +This directive is available as part of our only. + + + + + + + +debug | +info | +notice | +warn | +error + +upstream + + +Enables logging of session-related operations and sets the desired +logging level. + + + + +This directive is available as part of our only. + + + + + + + + + +location + + +Turns on upstream configuration HTTP interface in a surrounding location. +Access to this location should be +limited. + + + +Configuration commands allow to: + + +view all primary or backup servers in a group; + +view an individual server; + +modify an individual server; + +add a new server (see note below); + +remove an individual server. + + + +As noted in the directive, adding a server specified +as a domain name may result in several servers being added. +Since addresses in a group are not required to be unique, individual +servers in a group can be uniquely referenced to only by their ID. +IDs are assigned automatically and shown when viewing group configuration. + + + + +A command consists of parameters passed as request arguments, for example: + +http://127.0.0.1/upstream_conf?upstream=appservers + + + + +The following parameters are supported: + + + + +upstream=name + +Selects a group. +This parameter is mandatory. + + + +backup= + + +If unset, selects primary servers in the group. +If set, selects backup servers in the group. + + + +id=number + +Selects an individual primary or backup server in the group. + + + +remove= + +Removes an individual primary or backup server from the group. + + + +add= + +Adds a new primary or backup server to the group. + + + +server=address + +Same as the “address” parameter +of the directive. + + + +weight=number + +Same as the “weight” parameter +of the directive. + + + +max_fails=number + +Same as the “max_fails” parameter +of the directive. + + + +fail_timeout=time + +Same as the “fail_timeout” parameter +of the directive. + + + +down= + +Same as the “down” parameter +of the directive. + + + +up= + +The opposite of the “down” parameter +of the directive. + + + + +The first three parameters select a target the command applies to. +Without other parameters, configuration of the selected target +is shown. + + + +For example, to view the primary servers in the group: + +http://127.0.0.1/upstream_conf?upstream=appservers + + +To view the backup servers in the group: + +http://127.0.0.1/upstream_conf?upstream=appservers&backup= + + +To view an individual primary server in the group: + +http://127.0.0.1/upstream_conf?upstream=appservers&id=42 + + +To view an individual backup server in the group: + +http://127.0.0.1/upstream_conf?upstream=appservers&backup=&id=42 + + + + +To add a new primary or backup server to the group, +its address should be specified in the “server=” parameter. +Without other parameters specified, a server will be added with other +parameters set to their default values (see the directive). + + + +For example, to add a new primary server to the group: + +http://127.0.0.1/upstream_conf?add=&upstream=appservers&server=127.0.0.1:8080 + + +To add a new backup server to the group: + +http://127.0.0.1/upstream_conf?add=&upstream=appservers&backup=&server=127.0.0.1:8080 + + +To add a new primary server to the group, +set its parameters to non-default values +and mark it “down”: + +http://127.0.0.1/upstream_conf?add=&upstream=appservers&server=127.0.0.1:8080&weight=2&max_fails=3&fail_timeout=3s&down= + + + + +To remove an individual primary or backup server from the group, +it should be selected with the id= parameter. + + + +For example, to remove an individual primary server from the group: + +http://127.0.0.1/upstream_conf?remove=&upstream=appservers&id=42 + + +To remove an individual backup server from the group: + +http://127.0.0.1/upstream_conf?remove=&upstream=appservers&backup=&id=42 + + + + +To modify an individual primary or backup server in the group, +it should be selected with the id= parameter. + + + +For example, to modify an individual primary server in the group +by marking it “down”: + +http://127.0.0.1/upstream_conf?upstream=appservers&id=42&down= + + +To modify address of an individual backup server in the group: + +http://127.0.0.1/upstream_conf?upstream=appservers&backup=&id=42&server=192.0.2.3:8123 + + +To modify other parameters of an individual primary server in the group: + +http://127.0.0.1/upstream_conf?upstream=appservers&id=42&max_fails=3&weight=4 + + + + + + +This directive is available as part of our only. + + + + +
diff -r 417dc982362e -r aded7086e84f xml/en/docs/index.xml --- a/xml/en/docs/index.xml Wed Jul 31 23:46:04 2013 +0400 +++ b/xml/en/docs/index.xml Thu Aug 01 16:31:02 2013 +0400 @@ -8,7 +8,7 @@
@@ -196,6 +196,11 @@ + +ngx_http_f4f_module + + + ngx_http_fastcgi_module @@ -236,6 +241,11 @@ + +ngx_http_hls_module + + + ngx_http_image_filter_module @@ -311,6 +321,11 @@ + +ngx_http_session_log_module + + + ngx_http_spdy_module @@ -331,6 +346,11 @@ + +ngx_http_status_module + + + ngx_http_sub_module diff -r 417dc982362e -r aded7086e84f xml/en/docs/ngx_core_module.xml --- a/xml/en/docs/ngx_core_module.xml Wed Jul 31 23:46:04 2013 +0400 +++ b/xml/en/docs/ngx_core_module.xml Thu Aug 01 16:31:02 2013 +0400 @@ -10,7 +10,7 @@ + rev="9">
@@ -144,7 +144,8 @@ -file | stderr +file | stderr | +syslog:server=address[,parameter=value] [debug | info | notice | @@ -170,6 +171,8 @@ If filename is not absolute, it is prefixed with the prefix path. --> The special value stderr selects the standard error file. +Logging to syslog can be configured by specifying +the “syslog:” prefix. @@ -189,6 +192,66 @@ + +The following parameters configure logging to syslog: + + +server=address + +Defines an address of a syslog server. +An address can be specified as a domain name or IP address, +and an optional port, or as a UNIX-domain socket path +specified after the “unix:” prefix. +If port is not specified, the port 514 is used. +If a domain name resolves to several IP addresses, the first resolved +address is used. + + +facility=string + +Sets facility of syslog messages, as defined in +RFC 3164. +Facility can be one of “kern”, “user”, +“mail”, “daemon”, +“auth”, “intern”, +“lpr”, “news”, “uucp”, +“clock”, “authpriv”, +“ftp”, “ntp”, “audit”, +“alert”, “cron”, +“local0”..“local7”. +Default is “local7”. + + +tag=string + +Sets tag of syslog messages. +Default is “nginx”. + + + + + +Example syslog configuration: + +error_log syslog:server=192.168.1.1 debug; +error_log syslog:server=unix:/var/log/nginx.sock; +error_log syslog:server=[2001:db8::1]:12345,facility=local7,tag=nginx error; + + + + + +Logging to syslog is available as part of our only. + + + diff -r 417dc982362e -r aded7086e84f xsls/versions.xsls --- a/xsls/versions.xsls Wed Jul 31 23:46:04 2013 +0400 +++ b/xsls/versions.xsls Thu Aug 01 16:31:02 2013 +0400 @@ -15,4 +15,8 @@ /versions/download[@tag='stable'][1]/item[1]/@ver"; } +X:template = "commercial_version" { + commercial subscription } + +} diff -r 417dc982362e -r aded7086e84f xslt/versions.xslt --- a/xslt/versions.xslt Wed Jul 31 23:46:04 2013 +0400 +++ b/xslt/versions.xslt Thu Aug 01 16:31:02 2013 +0400 @@ -11,4 +11,9 @@ + + + commercial subscription + +