ludra/nginx-build
1
0 Fork 0
forked from Hakase/nginx-build
Code Issues Pull Requests Releases Wiki Activity

Latest update - 7215

Browse Source
This commit is contained in:
Hakase
2018-02-22 01:24:32 +09:00
parent 6795eee792
commit c582dc08e8
2 changed files with 53 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/http/modules/ngx_http_geo_module.c
+21 -12
View File
@@ -439,6 +439,7 @@ ngx_http_geo_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
ctx.temp_pool = ngx_create_pool(NGX_DEFAULT_POOL_SIZE, cf->log); ctx.temp_pool = ngx_create_pool(NGX_DEFAULT_POOL_SIZE, cf->log);
if (ctx.temp_pool == NULL) { if (ctx.temp_pool == NULL) {
ngx_destroy_pool(pool);
return NGX_CONF_ERROR; return NGX_CONF_ERROR;
} }
@@ -460,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;
@@ -482,7 +487,7 @@ ngx_http_geo_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
ctx.high.low[i] = ngx_palloc(cf->pool, len + sizeof(void *)); ctx.high.low[i] = ngx_palloc(cf->pool, len + sizeof(void *));
if (ctx.high.low[i] == NULL) { if (ctx.high.low[i] == NULL) {
return NGX_CONF_ERROR; goto failed;
} }
ngx_memcpy(ctx.high.low[i], a->elts, len); ngx_memcpy(ctx.high.low[i], a->elts, len);
@@ -508,14 +513,11 @@ ngx_http_geo_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
var->get_handler = ngx_http_geo_range_variable; var->get_handler = ngx_http_geo_range_variable;
var->data = (uintptr_t) geo; var->data = (uintptr_t) geo;
ngx_destroy_pool(ctx.temp_pool);
ngx_destroy_pool(pool);
} else { } else {
if (ctx.tree == NULL) { if (ctx.tree == NULL) {
ctx.tree = ngx_radix_tree_create(cf->pool, -1); ctx.tree = ngx_radix_tree_create(cf->pool, -1);
if (ctx.tree == NULL) { if (ctx.tree == NULL) {
return NGX_CONF_ERROR; goto failed;
} }
} }
@@ -525,7 +527,7 @@ ngx_http_geo_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
if (ctx.tree6 == NULL) { if (ctx.tree6 == NULL) {
ctx.tree6 = ngx_radix_tree_create(cf->pool, -1); ctx.tree6 = ngx_radix_tree_create(cf->pool, -1);
if (ctx.tree6 == NULL) { if (ctx.tree6 == NULL) {
return NGX_CONF_ERROR; goto failed;
} }
} }
@@ -535,14 +537,11 @@ ngx_http_geo_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
var->get_handler = ngx_http_geo_cidr_variable; var->get_handler = ngx_http_geo_cidr_variable;
var->data = (uintptr_t) geo; var->data = (uintptr_t) geo;
ngx_destroy_pool(ctx.temp_pool);
ngx_destroy_pool(pool);
if (ngx_radix32tree_insert(ctx.tree, 0, 0, if (ngx_radix32tree_insert(ctx.tree, 0, 0,
(uintptr_t) &ngx_http_variable_null_value) (uintptr_t) &ngx_http_variable_null_value)
== NGX_ERROR) == NGX_ERROR)
{ {
return NGX_CONF_ERROR; goto failed;
} }
/* NGX_BUSY is okay (default was set explicitly) */ /* NGX_BUSY is okay (default was set explicitly) */
@@ -552,12 +551,22 @@ ngx_http_geo_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
(uintptr_t) &ngx_http_variable_null_value) (uintptr_t) &ngx_http_variable_null_value)
== NGX_ERROR) == NGX_ERROR)
{ {
return NGX_CONF_ERROR; goto failed;
} }
#endif #endif
} }
return rv; ngx_destroy_pool(ctx.temp_pool);
ngx_destroy_pool(pool);
return NGX_CONF_OK;
failed:
ngx_destroy_pool(ctx.temp_pool);
ngx_destroy_pool(pool);
return NGX_CONF_ERROR;
} }
src/stream/ngx_stream_geo_module.c
+32 -23
View File
@@ -341,18 +341,18 @@ ngx_stream_geo_addr(ngx_stream_session_t *s, ngx_stream_geo_ctx_t *ctx,
static char * static char *
ngx_stream_geo_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) ngx_stream_geo_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
{ {
char *rv; char *rv;
size_t len; size_t len;
ngx_str_t *value, name; ngx_str_t *value, name;
ngx_uint_t i; ngx_uint_t i;
ngx_conf_t save; ngx_conf_t save;
ngx_pool_t *pool; ngx_pool_t *pool;
ngx_array_t *a; ngx_array_t *a;
ngx_stream_variable_t *var; ngx_stream_variable_t *var;
ngx_stream_geo_ctx_t *geo; ngx_stream_geo_ctx_t *geo;
ngx_stream_geo_conf_ctx_t ctx; ngx_stream_geo_conf_ctx_t ctx;
#if (NGX_HAVE_INET6) #if (NGX_HAVE_INET6)
static struct in6_addr zero; static struct in6_addr zero;
#endif #endif
value = cf->args->elts; value = cf->args->elts;
@@ -409,6 +409,7 @@ ngx_stream_geo_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
ctx.temp_pool = ngx_create_pool(NGX_DEFAULT_POOL_SIZE, cf->log); ctx.temp_pool = ngx_create_pool(NGX_DEFAULT_POOL_SIZE, cf->log);
if (ctx.temp_pool == NULL) { if (ctx.temp_pool == NULL) {
ngx_destroy_pool(pool);
return NGX_CONF_ERROR; return NGX_CONF_ERROR;
} }
@@ -430,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) {
@@ -449,7 +454,7 @@ ngx_stream_geo_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
ctx.high.low[i] = ngx_palloc(cf->pool, len + sizeof(void *)); ctx.high.low[i] = ngx_palloc(cf->pool, len + sizeof(void *));
if (ctx.high.low[i] == NULL) { if (ctx.high.low[i] == NULL) {
return NGX_CONF_ERROR; goto failed;
} }
ngx_memcpy(ctx.high.low[i], a->elts, len); ngx_memcpy(ctx.high.low[i], a->elts, len);
@@ -475,14 +480,11 @@ ngx_stream_geo_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
var->get_handler = ngx_stream_geo_range_variable; var->get_handler = ngx_stream_geo_range_variable;
var->data = (uintptr_t) geo; var->data = (uintptr_t) geo;
ngx_destroy_pool(ctx.temp_pool);
ngx_destroy_pool(pool);
} else { } else {
if (ctx.tree == NULL) { if (ctx.tree == NULL) {
ctx.tree = ngx_radix_tree_create(cf->pool, -1); ctx.tree = ngx_radix_tree_create(cf->pool, -1);
if (ctx.tree == NULL) { if (ctx.tree == NULL) {
return NGX_CONF_ERROR; goto failed;
} }
} }
@@ -492,7 +494,7 @@ ngx_stream_geo_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
if (ctx.tree6 == NULL) { if (ctx.tree6 == NULL) {
ctx.tree6 = ngx_radix_tree_create(cf->pool, -1); ctx.tree6 = ngx_radix_tree_create(cf->pool, -1);
if (ctx.tree6 == NULL) { if (ctx.tree6 == NULL) {
return NGX_CONF_ERROR; goto failed;
} }
} }
@@ -502,14 +504,11 @@ ngx_stream_geo_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
var->get_handler = ngx_stream_geo_cidr_variable; var->get_handler = ngx_stream_geo_cidr_variable;
var->data = (uintptr_t) geo; var->data = (uintptr_t) geo;
ngx_destroy_pool(ctx.temp_pool);
ngx_destroy_pool(pool);
if (ngx_radix32tree_insert(ctx.tree, 0, 0, if (ngx_radix32tree_insert(ctx.tree, 0, 0,
(uintptr_t) &ngx_stream_variable_null_value) (uintptr_t) &ngx_stream_variable_null_value)
== NGX_ERROR) == NGX_ERROR)
{ {
return NGX_CONF_ERROR; goto failed;
} }
/* NGX_BUSY is okay (default was set explicitly) */ /* NGX_BUSY is okay (default was set explicitly) */
@@ -519,12 +518,22 @@ ngx_stream_geo_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
(uintptr_t) &ngx_stream_variable_null_value) (uintptr_t) &ngx_stream_variable_null_value)
== NGX_ERROR) == NGX_ERROR)
{ {
return NGX_CONF_ERROR; goto failed;
} }
#endif #endif
} }
return rv; ngx_destroy_pool(ctx.temp_pool);
ngx_destroy_pool(pool);
return NGX_CONF_OK;
failed:
ngx_destroy_pool(ctx.temp_pool);
ngx_destroy_pool(pool);
return NGX_CONF_ERROR;
} }