Mercurial > hg > nginx-quic
comparison src/http/modules/ngx_http_sub_filter_module.c @ 5040:05beaa2d87b3 stable-1.2
Merge of r4948, r4949, r4964, r4973, r5011: variables.
*) Allow the complex value to be defined as an empty string.
This makes conversion from strings to complex values possible
without the loss of functionality.
*) The "auth_basic" directive gained support of variables.
*) Fixed variable syntax checking in "set", "geo", "limit_conn_zone",
and "perl_set" directives.
*) Added checks that disallow adding a variable with an empty name.
Added variable name syntax checks to "geo" and "map" directives.
*) Variables $pipe, $request_length, $time_iso8601, and $time_local.
Log module counterparts are preserved for efficiency.
Based on patch by Kiril Kalchev.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Sun, 10 Feb 2013 03:08:42 +0000 |
parents | d620f497c50f |
children |
comparison
equal
deleted
inserted
replaced
5039:b5601d23b61e | 5040:05beaa2d87b3 |
---|---|
625 ngx_http_sub_loc_conf_t *slcf = conf; | 625 ngx_http_sub_loc_conf_t *slcf = conf; |
626 | 626 |
627 ngx_str_t *value; | 627 ngx_str_t *value; |
628 ngx_http_compile_complex_value_t ccv; | 628 ngx_http_compile_complex_value_t ccv; |
629 | 629 |
630 if (slcf->match.len) { | 630 if (slcf->match.data) { |
631 return "is duplicate"; | 631 return "is duplicate"; |
632 } | 632 } |
633 | 633 |
634 value = cf->args->elts; | 634 value = cf->args->elts; |
635 | 635 |
685 ngx_http_sub_loc_conf_t *conf = child; | 685 ngx_http_sub_loc_conf_t *conf = child; |
686 | 686 |
687 ngx_conf_merge_value(conf->once, prev->once, 1); | 687 ngx_conf_merge_value(conf->once, prev->once, 1); |
688 ngx_conf_merge_str_value(conf->match, prev->match, ""); | 688 ngx_conf_merge_str_value(conf->match, prev->match, ""); |
689 | 689 |
690 if (conf->value.value.len == 0) { | 690 if (conf->value.value.data == NULL) { |
691 conf->value = prev->value; | 691 conf->value = prev->value; |
692 } | 692 } |
693 | 693 |
694 if (ngx_http_merge_types(cf, &conf->types_keys, &conf->types, | 694 if (ngx_http_merge_types(cf, &conf->types_keys, &conf->types, |
695 &prev->types_keys, &prev->types, | 695 &prev->types_keys, &prev->types, |