mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-11 04:12:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Geo: optimized configuration parser.

Browse Source 
If the geo block parser has failed, doing more things is pointless.
This commit is contained in:
Ruslan Ermilov 2018-02-21 15:50:43 +03:00
parent f98a8c4db6
commit 7a45918e0b
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/http/modules/ngx_http_geo_module.c
View File

@ -461,6 +461,10 @@ ngx_http_geo_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
*cf = save; *cf = save;
if (rv != NGX_CONF_OK) {
goto failed;
}
geo->proxies = ctx.proxies; geo->proxies = ctx.proxies;
geo->proxy_recursive = ctx.proxy_recursive; geo->proxy_recursive = ctx.proxy_recursive;
@ -555,7 +559,7 @@ ngx_http_geo_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
ngx_destroy_pool(ctx.temp_pool); ngx_destroy_pool(ctx.temp_pool);
ngx_destroy_pool(pool); ngx_destroy_pool(pool);
return rv; return NGX_CONF_OK;
failed: failed:

6
src/stream/ngx_stream_geo_module.c
View File

@ -431,6 +431,10 @@ ngx_stream_geo_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
*cf = save; *cf = save;
if (rv != NGX_CONF_OK) {
goto failed;
}
if (ctx.ranges) { if (ctx.ranges) {
if (ctx.high.low && !ctx.binary_include) { if (ctx.high.low && !ctx.binary_include) {
@ -522,7 +526,7 @@ ngx_stream_geo_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
ngx_destroy_pool(ctx.temp_pool); ngx_destroy_pool(ctx.temp_pool);
ngx_destroy_pool(pool); ngx_destroy_pool(pool);
return rv; return NGX_CONF_OK;
failed: failed: