Mercurial > hg > nginx-quic
comparison src/http/ngx_http_core_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 | 880dedfa4008 |
children | c43fa53c1d8f |
comparison
equal
deleted
inserted
replaced
5039:b5601d23b61e | 5040:05beaa2d87b3 |
---|---|
4542 return NGX_CONF_ERROR; | 4542 return NGX_CONF_ERROR; |
4543 } | 4543 } |
4544 | 4544 |
4545 ngx_str_null(&args); | 4545 ngx_str_null(&args); |
4546 | 4546 |
4547 if (cv.lengths == NULL && uri.data[0] == '/') { | 4547 if (cv.lengths == NULL && uri.len && uri.data[0] == '/') { |
4548 p = (u_char *) ngx_strchr(uri.data, '?'); | 4548 p = (u_char *) ngx_strchr(uri.data, '?'); |
4549 | 4549 |
4550 if (p) { | 4550 if (p) { |
4551 cv.value.len = p - uri.data; | 4551 cv.value.len = p - uri.data; |
4552 cv.value.data = uri.data; | 4552 cv.value.data = uri.data; |