diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2012-09-24 19:05:02 +0000 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2012-09-24 19:05:02 +0000 |
| commit | adceda60bde1882fb89a2d7e3c62b93e9337ed5e (patch) | |
| tree | 96009071ea9148cfc48cccc5ea6919d4fabaca9e /src/core | |
| parent | 892410148fb5ed8926723306d1af7238327a2101 (diff) | |
| download | nginx-adceda60bde1882fb89a2d7e3c62b93e9337ed5e.tar.gz nginx-adceda60bde1882fb89a2d7e3c62b93e9337ed5e.tar.bz2 | |
Merge of r4828: "include" with wildcards in map and types blocks.
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.
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/ngx_conf_file.c | 3 | ||||
| -rw-r--r-- | src/core/ngx_conf_file.h | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/core/ngx_conf_file.c b/src/core/ngx_conf_file.c index 0aa659cd8..6da2dae80 100644 --- a/src/core/ngx_conf_file.c +++ b/src/core/ngx_conf_file.c @@ -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 @@ ngx_conf_read_token(ngx_conf_t *cf) } -static char * +char * ngx_conf_include(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) { char *rv; diff --git a/src/core/ngx_conf_file.h b/src/core/ngx_conf_file.h index 41bacaa98..64a9e8fc8 100644 --- a/src/core/ngx_conf_file.h +++ b/src/core/ngx_conf_file.h @@ -317,6 +317,7 @@ char *ngx_conf_check_num_bounds(ngx_conf_t *cf, void *post, void *data); char *ngx_conf_param(ngx_conf_t *cf); char *ngx_conf_parse(ngx_conf_t *cf, ngx_str_t *filename); +char *ngx_conf_include(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); ngx_int_t ngx_conf_full_name(ngx_cycle_t *cycle, ngx_str_t *name, |