diff options
| author | Ruslan Ermilov <ru@nginx.com> | 2018-02-21 15:50:43 +0300 |
|---|---|---|
| committer | Ruslan Ermilov <ru@nginx.com> | 2018-02-21 15:50:43 +0300 |
| commit | 7a45918e0bb5502cda940565de726a13140e92cf (patch) | |
| tree | 35f9bad87ee23d217cf4ad8d7859387d8e1bcc2a /src | |
| parent | f98a8c4db622223485ad5f175c79ecc0695ed5cc (diff) | |
| download | nginx-7a45918e0bb5502cda940565de726a13140e92cf.tar.gz nginx-7a45918e0bb5502cda940565de726a13140e92cf.zip | |
Geo: optimized configuration parser.
If the geo block parser has failed, doing more things is pointless.
Diffstat (limited to 'src')
| -rw-r--r-- | src/http/modules/ngx_http_geo_module.c | 6 | ||||
| -rw-r--r-- | src/stream/ngx_stream_geo_module.c | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/http/modules/ngx_http_geo_module.c b/src/http/modules/ngx_http_geo_module.c index 9102c987d..c11bafa6f 100644 --- a/src/http/modules/ngx_http_geo_module.c +++ b/src/http/modules/ngx_http_geo_module.c @@ -461,6 +461,10 @@ ngx_http_geo_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) *cf = save; + if (rv != NGX_CONF_OK) { + goto failed; + } + geo->proxies = ctx.proxies; 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(pool); - return rv; + return NGX_CONF_OK; failed: diff --git a/src/stream/ngx_stream_geo_module.c b/src/stream/ngx_stream_geo_module.c index 6b69d9bba..b4ad7ef8b 100644 --- a/src/stream/ngx_stream_geo_module.c +++ b/src/stream/ngx_stream_geo_module.c @@ -431,6 +431,10 @@ ngx_stream_geo_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) *cf = save; + if (rv != NGX_CONF_OK) { + goto failed; + } + if (ctx.ranges) { 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(pool); - return rv; + return NGX_CONF_OK; failed: |