Mercurial > hg > nginx-vendor-current

comparison src/http/ngx_http_core_module.c @ 666:bf8b55a5ac89 NGINX_1_1_17

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 1.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.
author Igor Sysoev <http://sysoev.ru>
date Thu, 15 Mar 2012 00:00:00 +0400
parents f5b859b2f097
children 9fbf3ad94cbf
comparison
equal deleted inserted replaced
665:a8821023989f 666:bf8b55a5ac89
3968 if (lsopt.tcp_keepcnt == NGX_ERROR) { 3968 if (lsopt.tcp_keepcnt == NGX_ERROR) {
3969 goto invalid_so_keepalive; 3969 goto invalid_so_keepalive;
3970 } 3970 }
3971 } 3971 }
3972 3972
3973 if (lsopt.tcp_keepidle == 0 && lsopt.tcp_keepintvl == 0 3973 if (lsopt.tcp_keepidle == 0 && lsopt.tcp_keepintvl == 0
3974 && lsopt.tcp_keepcnt == 0) 3974 && lsopt.tcp_keepcnt == 0)
3975 { 3975 {
3976 goto invalid_so_keepalive; 3976 goto invalid_so_keepalive;
3977 } 3977 }
3978 3978
4627 return NGX_CONF_OK; 4627 return NGX_CONF_OK;
4628 } 4628 }
4629 4629
4630 if (max == 0) { 4630 if (max == 0) {
4631 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, 4631 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
4632 "\"open_file_cache\" must have the \"max\" parameter"); 4632 "\"open_file_cache\" must have the \"max\" parameter");
4633 return NGX_CONF_ERROR; 4633 return NGX_CONF_ERROR;
4634 } 4634 }
4635 4635
4636 clcf->open_file_cache = ngx_open_file_cache_init(cf->pool, max, inactive); 4636 clcf->open_file_cache = ngx_open_file_cache_init(cf->pool, max, inactive);
4637 if (clcf->open_file_cache) { 4637 if (clcf->open_file_cache) {