diff options
| author | NGINX team <nginx@nginx.org> | 2012-03-15 12:18:04 +0000 |
|---|---|---|
| committer | Jon Kolb <jon@b0g.us> | 2012-03-15 12:18:04 +0000 |
| commit | 3e2cd7431101761df65f2242c667c037599aa0c4 (patch) | |
| tree | 307ebbf59aebdbce2062ddc24cc505bfd4b80cad /src/core | |
| parent | 55ebd600fb4c3d0842a9d7ed29c7b8d3e56f848d (diff) | |
| download | nginx-3e2cd7431101761df65f2242c667c037599aa0c4.tar.gz | |
Changes with nginx 1.1.17 15 Mar 2012v1.1.17
*) Security: content of previously freed memory might be sent to a
client if backend returned specially crafted response.
Thanks to Matthew Daley.
*) Bugfix: in the embedded perl module if used from SSI.
Thanks to Matthew Daley.
*) Bugfix: in the ngx_http_uwsgi_module.
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/nginx.h | 4 | ||||
| -rw-r--r-- | src/core/ngx_connection.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/core/nginx.h b/src/core/nginx.h index fab6ce688..cd27398dd 100644 --- a/src/core/nginx.h +++ b/src/core/nginx.h @@ -9,8 +9,8 @@ #define _NGINX_H_INCLUDED_ -#define nginx_version 1001016 -#define NGINX_VERSION "1.1.16" +#define nginx_version 1001017 +#define NGINX_VERSION "1.1.17" #define NGINX_VER "nginx/" NGINX_VERSION #define NGINX_VAR "NGINX" diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c index 6e09eb80a..4d1aa0d1b 100644 --- a/src/core/ngx_connection.c +++ b/src/core/ngx_connection.c @@ -514,7 +514,7 @@ ngx_configure_listening_sockets(ngx_cycle_t *cycle) } } -#if (NGX_HAVE_KEEPALIVE_TUNABLE) +#if (NGX_HAVE_KEEPALIVE_TUNABLE) if (ls[i].keepidle) { if (setsockopt(ls[i].fd, IPPROTO_TCP, TCP_KEEPIDLE, |