comparison src/http/modules/ngx_http_split_clients_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 5a4666d4b6cb
children b78cf2414fda
comparison
equal deleted inserted replaced
5039:b5601d23b61e 5040:05beaa2d87b3
137 return NGX_CONF_ERROR; 137 return NGX_CONF_ERROR;
138 } 138 }
139 139
140 name = value[2]; 140 name = value[2];
141 141
142 if (name.len < 2 || name.data[0] != '$') { 142 if (name.data[0] != '$') {
143 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, 143 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
144 "invalid variable name \"%V\"", &name); 144 "invalid variable name \"%V\"", &name);
145 return NGX_CONF_ERROR; 145 return NGX_CONF_ERROR;
146 } 146 }
147 147