Mercurial > hg > nginx
comparison src/core/ngx_conf_file.h @ 623:0216fd1471f3 release-0.3.33
nginx-0.3.33-RELEASE import
*) Feature: the "http_503" parameter of the "proxy_next_upstream" or
"fastcgi_next_upstream" directives.
*) Bugfix: ngx_http_perl_module did not work with inlined in the
configuration code, if it was not started with the "sub" word.
*) Bugfix: in the "post_action" directive.
| author | Igor Sysoev <igor@sysoev.ru> |
|---|---|
| date | Wed, 15 Mar 2006 09:53:04 +0000 |
| parents | 425af804d968 |
| children | 4946078f0a79 |
comparison
equal
deleted
inserted
replaced
| 622:b088081fe8c3 | 623:0216fd1471f3 |
|---|---|
| 280 conf = (prev == NGX_CONF_UNSET_SIZE) ? default : prev; \ | 280 conf = (prev == NGX_CONF_UNSET_SIZE) ? default : prev; \ |
| 281 } | 281 } |
| 282 | 282 |
| 283 #define ngx_conf_merge_str_value(conf, prev, default) \ | 283 #define ngx_conf_merge_str_value(conf, prev, default) \ |
| 284 if (conf.data == NULL) { \ | 284 if (conf.data == NULL) { \ |
| 285 if (prev.data) { \ | 285 if (prev.data) { \ |
| 286 conf.len = prev.len; \ | 286 conf.len = prev.len; \ |
| 287 conf.data = prev.data; \ | 287 conf.data = prev.data; \ |
| 288 } else { \ | 288 } else { \ |
| 289 conf.len = sizeof(default) - 1; \ | 289 conf.len = sizeof(default) - 1; \ |
| 290 conf.data = (u_char *) default; \ | 290 conf.data = (u_char *) default; \ |