comparison src/http/modules/ngx_http_uwsgi_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 979e0f5b196d
children fd84344f1df7
comparison
equal deleted inserted replaced
5039:b5601d23b61e 5040:05beaa2d87b3
1805 ngx_str_t *value; 1805 ngx_str_t *value;
1806 ngx_http_compile_complex_value_t ccv; 1806 ngx_http_compile_complex_value_t ccv;
1807 1807
1808 value = cf->args->elts; 1808 value = cf->args->elts;
1809 1809
1810 if (uwcf->cache_key.value.len) { 1810 if (uwcf->cache_key.value.data) {
1811 return "is duplicate"; 1811 return "is duplicate";
1812 } 1812 }
1813 1813
1814 ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t)); 1814 ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
1815 1815