diff options
| author | Eugene Grebenschikov <e.grebenshchikov@f5.com> | 2026-03-11 17:57:05 -0700 |
|---|---|---|
| committer | Eugene <54681898+jimf5@users.noreply.github.com> | 2026-03-24 11:20:16 -0700 |
| commit | 0de6e878ba43b55dd23b437c5be1819a55f63ec4 (patch) | |
| tree | e1c6c55c0bafa182c0b83fd30b023661ed153e11 /src/http/modules | |
| parent | 5ac6f49371f9fcdf21ca4b4fd2a8657576f0885b (diff) | |
| download | nginx-0de6e878ba43b55dd23b437c5be1819a55f63ec4.tar.gz nginx-0de6e878ba43b55dd23b437c5be1819a55f63ec4.tar.bz2 | |
Fixed the "include" directive inside the "geo" block.
The "include" directive should be able to include multiple files if
given a filename mask.
Completes remaining changes introduced in da4ffd8.
Closes: https://github.com/nginx/nginx/issues/1165
Diffstat (limited to 'src/http/modules')
| -rw-r--r-- | src/http/modules/ngx_http_geo_module.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/http/modules/ngx_http_geo_module.c b/src/http/modules/ngx_http_geo_module.c index 619a5fde8..5018e1abb 100644 --- a/src/http/modules/ngx_http_geo_module.c +++ b/src/http/modules/ngx_http_geo_module.c @@ -645,7 +645,12 @@ ngx_http_geo(ngx_conf_t *cf, ngx_command_t *dummy, void *conf) if (ngx_strcmp(value[0].data, "include") == 0) { - rv = ngx_http_geo_include(cf, ctx, &value[1]); + if (strpbrk((char *) value[1].data, "*?[") == NULL) { + rv = ngx_http_geo_include(cf, ctx, &value[1]); + + } else { + rv = ngx_conf_include(cf, dummy, conf); + } goto done; |