diff options
author | Vladimir Homutov <vl@nginx.com> | 2019-01-17 14:31:04 +0300 |
---|---|---|
committer | Vladimir Homutov <vl@nginx.com> | 2019-01-17 14:31:04 +0300 |
commit | b6b39b2fb9c66f2a05153bbc4fa770b9e3850491 (patch) | |
tree | 0b11ad1a58275f13466322753024f8cbe94b0c3f /src | |
parent | de20d73ec58289c80e4708efccb02596c39479f0 (diff) |
Added the ngx_http_test_required_predicates() function.
In contrast to ngx_http_test_predicates(), it requires all values to be
non-empty and not equal to "0".
Diffstat (limited to 'src')
-rw-r--r-- | src/http/ngx_http_script.c | 28 | ||||
-rw-r--r-- | src/http/ngx_http_script.h | 2 |
2 files changed, 30 insertions, 0 deletions
diff --git a/src/http/ngx_http_script.c b/src/http/ngx_http_script.c index 1a8773561..415388904 100644 --- a/src/http/ngx_http_script.c +++ b/src/http/ngx_http_script.c @@ -271,6 +271,34 @@ ngx_http_test_predicates(ngx_http_request_t *r, ngx_array_t *predicates) } +ngx_int_t +ngx_http_test_required_predicates(ngx_http_request_t *r, + ngx_array_t *predicates) +{ + ngx_str_t val; + ngx_uint_t i; + ngx_http_complex_value_t *cv; + + if (predicates == NULL) { + return NGX_OK; + } + + cv = predicates->elts; + + for (i = 0; i < predicates->nelts; i++) { + if (ngx_http_complex_value(r, &cv[i], &val) != NGX_OK) { + return NGX_ERROR; + } + + if (val.len == 0 || (val.len == 1 && val.data[0] == '0')) { + return NGX_DECLINED; + } + } + + return NGX_OK; +} + + char * ngx_http_set_predicate_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) { diff --git a/src/http/ngx_http_script.h b/src/http/ngx_http_script.h index a5116d747..25bb6d73f 100644 --- a/src/http/ngx_http_script.h +++ b/src/http/ngx_http_script.h @@ -214,6 +214,8 @@ char *ngx_http_set_complex_value_slot(ngx_conf_t *cf, ngx_command_t *cmd, ngx_int_t ngx_http_test_predicates(ngx_http_request_t *r, ngx_array_t *predicates); +ngx_int_t ngx_http_test_required_predicates(ngx_http_request_t *r, + ngx_array_t *predicates); char *ngx_http_set_predicate_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); |