Author: ru
Date: 2012-08-28 13:31:01 +0000 (Tue, 28 Aug 2012)
New Revision: 4828
URL: http://trac.nginx.org/nginx/changeset/4828/nginx

Log:
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.


Modified:
trunk/src/core/ngx_conf_file.c
trunk/src/core/ngx_conf_file.h
trunk/src/http/modules/ngx_http_map_module.c
trunk/src/http/ngx_http_core_module.c

Modified: trunk/src/core/ngx_conf_file.c
===================================================================
--- trunk/src/core/ngx_conf_file.c 2012-08-27 14:21:41 UTC (rev 4827)
+++ trunk/src/core/ngx_conf_file.c 2012-08-28 13:31:01 UTC (rev 4828)
@@ -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;

Modified: trunk/src/core/ngx_conf_file.h
===================================================================
--- trunk/src/core/ngx_conf_file.h 2012-08-27 14:21:41 UTC (rev 4827)
+++ trunk/src/core/ngx_conf_file.h 2012-08-28 13:31:01 UTC (rev 4828)
@@ -317,6 +317,7 @@

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,

Modified: trunk/src/http/modules/ngx_http_map_module.c
===================================================================
--- trunk/src/http/modules/ngx_http_map_module.c 2012-08-27 14:21:41 UTC (rev 4827)
+++ trunk/src/http/modules/ngx_http_map_module.c 2012-08-28 13:31:01 UTC (rev 4828)
@@ -369,7 +369,7 @@
ngx_http_map(ngx_conf_t *cf, ngx_command_t *dummy, void *conf)
{
ngx_int_t rc, index;
- ngx_str_t *value, file, name;
+ ngx_str_t *value, name;
ngx_uint_t i, key;
ngx_http_map_conf_ctx_t *ctx;
ngx_http_variable_value_t *var, **vp;
@@ -391,15 +391,7 @@
}

if (ngx_strcmp(value[0].data, "include") == 0) {
- file = value[1];
-
- if (ngx_conf_full_name(cf->cycle, &file, 1) != NGX_OK) {
- return NGX_CONF_ERROR;
- }
-
- ngx_log_debug1(NGX_LOG_DEBUG_CORE, cf->log, 0, "include %s", file.data);
-
- return ngx_conf_parse(cf, &file);
+ return ngx_conf_include(cf, dummy, conf);
}

if (value[1].data[0] == '$') {

Modified: trunk/src/http/ngx_http_core_module.c
===================================================================
--- trunk/src/http/ngx_http_core_module.c 2012-08-27 14:21:41 UTC (rev 4827)
+++ trunk/src/http/ngx_http_core_module.c 2012-08-28 13:31:01 UTC (rev 4828)
@@ -3236,7 +3236,7 @@
{
ngx_http_core_loc_conf_t *clcf = conf;

- ngx_str_t *value, *content_type, *old, file;
+ ngx_str_t *value, *content_type, *old;
ngx_uint_t i, n, hash;
ngx_hash_key_t *type;

@@ -3249,15 +3249,8 @@
" in \"include\" directive");
return NGX_CONF_ERROR;
}
- file = value[1];

- if (ngx_conf_full_name(cf->cycle, &file, 1) != NGX_OK) {
- return NGX_CONF_ERROR;
- }
-
- ngx_log_debug1(NGX_LOG_DEBUG_CORE, cf->log, 0, "include %s", file.data);
-
- return ngx_conf_parse(cf, &file);
+ return ngx_conf_include(cf, dummy, conf);
}

content_type = ngx_palloc(cf->pool, sizeof(ngx_str_t));

_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel