comparison src/http/modules/ngx_http_scgi_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
comparison
equal deleted inserted replaced
5039:b5601d23b61e 5040:05beaa2d87b3
1763 ngx_str_t *value; 1763 ngx_str_t *value;
1764 ngx_http_compile_complex_value_t ccv; 1764 ngx_http_compile_complex_value_t ccv;
1765 1765
1766 value = cf->args->elts; 1766 value = cf->args->elts;
1767 1767
1768 if (scf->cache_key.value.len) { 1768 if (scf->cache_key.value.data) {
1769 return "is duplicate"; 1769 return "is duplicate";
1770 } 1770 }
1771 1771
1772 ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t)); 1772 ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
1773 1773