Mercurial > hg > nginx
comparison src/http/modules/ngx_http_fastcgi_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 | 9be0b6b749ae |
children | fd84344f1df7 10f5831cf56e |
comparison
equal
deleted
inserted
replaced
5039:b5601d23b61e | 5040:05beaa2d87b3 |
---|---|
3012 ngx_str_t *value; | 3012 ngx_str_t *value; |
3013 ngx_http_compile_complex_value_t ccv; | 3013 ngx_http_compile_complex_value_t ccv; |
3014 | 3014 |
3015 value = cf->args->elts; | 3015 value = cf->args->elts; |
3016 | 3016 |
3017 if (flcf->cache_key.value.len) { | 3017 if (flcf->cache_key.value.data) { |
3018 return "is duplicate"; | 3018 return "is duplicate"; |
3019 } | 3019 } |
3020 | 3020 |
3021 ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t)); | 3021 ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t)); |
3022 | 3022 |