diff options
| author | Ruslan Ermilov <ru@nginx.com> | 2012-08-28 13:31:01 +0000 |
|---|---|---|
| committer | Ruslan Ermilov <ru@nginx.com> | 2012-08-28 13:31:01 +0000 |
| commit | da4ffd8955b14383d6c027004d8beb85395ce9f5 (patch) | |
| tree | 7b75327acd157fc9c48fc0ce93c938cbc12f81a7 /src/core/ngx_conf_file.c | |
| parent | 43f6163063bc0d4f7477156141c6df651ea5ca8b (diff) | |
| download | nginx-da4ffd8955b14383d6c027004d8beb85395ce9f5.tar.gz nginx-da4ffd8955b14383d6c027004d8beb85395ce9f5.zip | |
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.
Diffstat (limited to 'src/core/ngx_conf_file.c')
| -rw-r--r-- | src/core/ngx_conf_file.c | 3 |
1 files changed, 1 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; |