aboutsummaryrefslogtreecommitdiff
path: root/src/http/modules/ngx_http_limit_conn_module.c
diff options
context:
space:
mode:
authorRuslan Ermilov <ru@nginx.com>2012-12-17 19:03:33 +0000
committerRuslan Ermilov <ru@nginx.com>2012-12-17 19:03:33 +0000
commitc865f8dfa2826592b41b86e0048dd418c9eb86b8 (patch)
treeec42de5bb1d7035acfdccce5b309a3bd35d39b37 /src/http/modules/ngx_http_limit_conn_module.c
parentb8a90c69039046ff6196b9e174e21c5377ed07dd (diff)
downloadnginx-c865f8dfa2826592b41b86e0048dd418c9eb86b8.tar.gz
nginx-c865f8dfa2826592b41b86e0048dd418c9eb86b8.zip
Added checks that disallow adding a variable with an empty name.
Added variable name syntax checks to "geo" and "map" directives.
Diffstat (limited to 'src/http/modules/ngx_http_limit_conn_module.c')
-rw-r--r--src/http/modules/ngx_http_limit_conn_module.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/http/modules/ngx_http_limit_conn_module.c b/src/http/modules/ngx_http_limit_conn_module.c
index 4f9935579..e82ca493d 100644
--- a/src/http/modules/ngx_http_limit_conn_module.c
+++ b/src/http/modules/ngx_http_limit_conn_module.c
@@ -540,7 +540,7 @@ ngx_http_limit_conn_zone(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
continue;
}
- if (value[i].len > 1 && value[i].data[0] == '$') {
+ if (value[i].data[0] == '$') {
value[i].len--;
value[i].data++;
@@ -613,7 +613,7 @@ ngx_http_limit_zone(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
value = cf->args->elts;
- if (value[2].len < 2 || value[2].data[0] != '$') {
+ if (value[2].data[0] != '$') {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"invalid variable name \"%V\"", &value[2]);
return NGX_CONF_ERROR;