Mercurial > hg > nginx-vendor-1-0
comparison src/core/ngx_conf_file.h @ 332:3a91bfeffaba NGINX_0_6_10
nginx 0.6.10
*) Feature: the "open_file_cache", "open_file_cache_retest", and
"open_file_cache_errors" directives.
*) Bugfix: socket leak; bug appeared in 0.6.7.
*) Bugfix: a charset set by the "charset" directive was not appended to
the "Content-Type" header set by $r->send_http_header().
*) Bugfix: a segmentation fault might occur in worker process if
/dev/poll method was used.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Mon, 03 Sep 2007 00:00:00 +0400 |
parents | f7cd062ee035 |
children | 12defd37f578 |
comparison
equal
deleted
inserted
replaced
331:b69d5e83bf82 | 332:3a91bfeffaba |
---|---|
255 if (conf == NGX_CONF_UNSET) { \ | 255 if (conf == NGX_CONF_UNSET) { \ |
256 conf = (prev == NGX_CONF_UNSET) ? default : prev; \ | 256 conf = (prev == NGX_CONF_UNSET) ? default : prev; \ |
257 } | 257 } |
258 | 258 |
259 #define ngx_conf_merge_ptr_value(conf, prev, default) \ | 259 #define ngx_conf_merge_ptr_value(conf, prev, default) \ |
260 if (conf == NULL) { \ | 260 if (conf == NGX_CONF_UNSET_PTR) { \ |
261 conf = (prev == NULL) ? default : prev; \ | 261 conf = (prev == NGX_CONF_UNSET_PTR) ? default : prev; \ |
262 } | 262 } |
263 | 263 |
264 #define ngx_conf_merge_uint_value(conf, prev, default) \ | 264 #define ngx_conf_merge_uint_value(conf, prev, default) \ |
265 if (conf == NGX_CONF_UNSET_UINT) { \ | 265 if (conf == NGX_CONF_UNSET_UINT) { \ |
266 conf = (prev == NGX_CONF_UNSET_UINT) ? default : prev; \ | 266 conf = (prev == NGX_CONF_UNSET_UINT) ? default : prev; \ |