Mercurial > hg > nginx
comparison src/core/ngx_conf_file.h @ 1452:cd586e963db0
change ngx_conf_merge_ptr_value() and update fastcgi_catch_stderr
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Sat, 01 Sep 2007 12:05:55 +0000 |
parents | e958b3cab51a |
children | 01b71aa095cc a3f062177dba |
comparison
equal
deleted
inserted
replaced
1451:ae957ab627e2 | 1452:cd586e963db0 |
---|---|
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; \ |