diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2013-02-10 03:08:42 +0000 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2013-02-10 03:08:42 +0000 |
| commit | 8967b7e032aad31ceb6b6fba9ae71f5eb3c16010 (patch) | |
| tree | 83252f3047184d6945493b5e346d6359db488032 /src/http/ngx_http_core_module.c | |
| parent | 374b73c43c9b78d523f048be0a72fc7d4538813f (diff) | |
| download | nginx-8967b7e032aad31ceb6b6fba9ae71f5eb3c16010.tar.gz nginx-8967b7e032aad31ceb6b6fba9ae71f5eb3c16010.tar.bz2 | |
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.
Diffstat (limited to 'src/http/ngx_http_core_module.c')
| -rw-r--r-- | src/http/ngx_http_core_module.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c index e02a251c3..bfb685470 100644 --- a/src/http/ngx_http_core_module.c +++ b/src/http/ngx_http_core_module.c @@ -4544,7 +4544,7 @@ ngx_http_core_error_page(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) ngx_str_null(&args); - if (cv.lengths == NULL && uri.data[0] == '/') { + if (cv.lengths == NULL && uri.len && uri.data[0] == '/') { p = (u_char *) ngx_strchr(uri.data, '?'); if (p) { |