Mercurial > hg > nginx
diff src/core/ngx_conf_file.c @ 4827:6e46016ea276
Fixed the "include" directive.
The "include" directive should be able to include multiple files if
given a filename mask. Fixed this to work for "include" directives
inside the "map" or "types" blocks. The "include" directive inside
the "geo" block is still not fixed.
author | Ruslan Ermilov <ru@nginx.com> |
---|---|
date | Tue, 28 Aug 2012 13:31:01 +0000 |
parents | 1c5e2e4d5b35 |
children | c821975c9068 |
line wrap: on
line diff
--- a/src/core/ngx_conf_file.c Mon Aug 27 14:21:41 2012 +0000 +++ b/src/core/ngx_conf_file.c Tue Aug 28 13:31:01 2012 +0000 @@ -12,7 +12,6 @@ static ngx_int_t ngx_conf_handler(ngx_conf_t *cf, ngx_int_t last); static ngx_int_t ngx_conf_read_token(ngx_conf_t *cf); -static char *ngx_conf_include(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); static ngx_int_t ngx_conf_test_full_name(ngx_str_t *name); static void ngx_conf_flush_files(ngx_cycle_t *cycle); @@ -731,7 +730,7 @@ } -static char * +char * ngx_conf_include(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) { char *rv;