Geo: optimized configuration parser.
If the geo block parser has failed, doing more things is pointless.
diff --git a/src/http/modules/ngx_http_geo_module.c b/src/http/modules/ngx_http_geo_module.c
index 9102c98..c11bafa 100644
--- a/src/http/modules/ngx_http_geo_module.c
+++ b/src/http/modules/ngx_http_geo_module.c
@@ -461,6 +461,10 @@
*cf = save;
+ if (rv != NGX_CONF_OK) {
+ goto failed;
+ }
+
geo->proxies = ctx.proxies;
geo->proxy_recursive = ctx.proxy_recursive;
@@ -555,7 +559,7 @@
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 6b69d9b..b4ad7ef 100644
--- a/src/stream/ngx_stream_geo_module.c
+++ b/src/stream/ngx_stream_geo_module.c
@@ -431,6 +431,10 @@
*cf = save;
+ if (rv != NGX_CONF_OK) {
+ goto failed;
+ }
+
if (ctx.ranges) {
if (ctx.high.low && !ctx.binary_include) {
@@ -522,7 +526,7 @@
ngx_destroy_pool(ctx.temp_pool);
ngx_destroy_pool(pool);
- return rv;
+ return NGX_CONF_OK;
failed: