diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2011-12-12 15:04:54 +0000 |
|---|---|---|
| committer | Jonathan Kolb <jon@b0g.us> | 2011-12-12 15:04:54 +0000 |
| commit | f3f84820db369aade03ed922872e206760e0ce0f (patch) | |
| tree | 2e2010e8de0d85c2c291b7bdc3caca6f808f72c4 /src/http/ngx_http.c | |
| parent | 56831c260fdbd5d130c692d0d4dc8918a462f4bb (diff) | |
| download | nginx-f3f84820db369aade03ed922872e206760e0ce0f.tar.gz | |
Changes with nginx 1.1.11 12 Dec 2011v1.1.11
*) Feature: the "so_keepalive" parameter of the "listen" directive.
Thanks to Vsevolod Stakhov.
*) Feature: the "if_not_empty" parameter of the
"fastcgi/scgi/uwsgi_param" directives.
*) Feature: the $https variable.
*) Feature: the "proxy_redirect" directive supports variables in the
first parameter.
*) Feature: the "proxy_redirect" directive supports regular expressions.
*) Bugfix: the $sent_http_cache_control variable might contain a wrong
value if the "expires" directive was used.
Thanks to Yichun Zhang.
*) Bugfix: the "read_ahead" directive might not work combined with
"try_files" and "open_file_cache".
*) Bugfix: a segmentation fault might occur in a worker process if small
time was used in the "inactive" parameter of the "proxy_cache_path"
directive.
*) Bugfix: responses from cache might hang.
Maxim Dounin
_______________________________________________
nginx-announce mailing list
nginx-announce@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-announce
Diffstat (limited to 'src/http/ngx_http.c')
| -rw-r--r-- | src/http/ngx_http.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/http/ngx_http.c b/src/http/ngx_http.c index 1eb22f81e..e10dbc88d 100644 --- a/src/http/ngx_http.c +++ b/src/http/ngx_http.c @@ -1762,6 +1762,13 @@ ngx_http_add_listening(ngx_conf_t *cf, ngx_http_conf_addr_t *addr) ls->rcvbuf = addr->opt.rcvbuf; ls->sndbuf = addr->opt.sndbuf; + ls->keepalive = addr->opt.so_keepalive; +#if (NGX_HAVE_KEEPALIVE_TUNABLE) + ls->keepidle = addr->opt.tcp_keepidle; + ls->keepintvl = addr->opt.tcp_keepintvl; + ls->keepcnt = addr->opt.tcp_keepcnt; +#endif + #if (NGX_HAVE_DEFERRED_ACCEPT && defined SO_ACCEPTFILTER) ls->accept_filter = addr->opt.accept_filter; #endif |