Mercurial > hg > nginx

comparison src/core/ngx_conf_file.h @ 4856:43b7b9572fe1 stable-1.2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 24 Sep 2012 19:05:02 +0000
parents 92a620dd8036
children a0599b56e748
comparison
equal deleted inserted replaced
4855:f66d0a6d7fdd 4856:43b7b9572fe1
315 } 315 }
316 316
317 317
318 char *ngx_conf_param(ngx_conf_t *cf); 318 char *ngx_conf_param(ngx_conf_t *cf);
319 char *ngx_conf_parse(ngx_conf_t *cf, ngx_str_t *filename); 319 char *ngx_conf_parse(ngx_conf_t *cf, ngx_str_t *filename);
320 char *ngx_conf_include(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
320 321
321 322
322 ngx_int_t ngx_conf_full_name(ngx_cycle_t *cycle, ngx_str_t *name, 323 ngx_int_t ngx_conf_full_name(ngx_cycle_t *cycle, ngx_str_t *name,
323 ngx_uint_t conf_prefix); 324 ngx_uint_t conf_prefix);
324 ngx_open_file_t *ngx_conf_open_file(ngx_cycle_t *cycle, ngx_str_t *name); 325 ngx_open_file_t *ngx_conf_open_file(ngx_cycle_t *cycle, ngx_str_t *name);