diff options
author | Igor Sysoev <igor@sysoev.ru> | 2005-10-24 15:09:41 +0000 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2005-10-24 15:09:41 +0000 |
commit | 9ac946bcc9f8f3735af8eb253c1e89f177db5827 (patch) | |
tree | 0d42898bfbe5931131d4544699b18c9d697d2cef /src/http/ngx_http_variables.c | |
parent | 51d8bcc28b729a8a3056a0c98e2c44e466351141 (diff) | |
download | nginx-9ac946bcc9f8f3735af8eb253c1e89f177db5827.tar.gz nginx-9ac946bcc9f8f3735af8eb253c1e89f177db5827.zip |
nginx-0.3.6-RELEASE importrelease-0.3.6
*) Change: now the IMAP/POP3 proxy do not send the empty login to
authorization server.
*) Feature: the "log_format" supports the variables in the $name form.
*) Bugfix: if at least in one server was no the "listen" directive,
then nginx did not listen on the 80 port; the bug had appeared in
0.3.3.
*) Bugfix: if the URI part is omitted in "proxy_pass" directive, the
the 80 port was always used.
Diffstat (limited to 'src/http/ngx_http_variables.c')
-rw-r--r-- | src/http/ngx_http_variables.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/http/ngx_http_variables.c b/src/http/ngx_http_variables.c index 7e4a79f1b..3cb3bdf5b 100644 --- a/src/http/ngx_http_variables.c +++ b/src/http/ngx_http_variables.c @@ -97,6 +97,9 @@ static ngx_http_variable_t ngx_http_core_variables[] = { { ngx_string("document_uri"), ngx_http_variable_request, offsetof(ngx_http_request_t, uri), 0, 0 }, + { ngx_string("request"), ngx_http_variable_request, + offsetof(ngx_http_request_t, request_line), 0, 0 }, + { ngx_string("document_root"), ngx_http_variable_document_root, 0, 0, 0 }, { ngx_string("query_string"), ngx_http_variable_request, @@ -705,7 +708,8 @@ ngx_http_variables_add_core_vars(ngx_conf_t *cf) cmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_core_module); if (ngx_array_init(&cmcf->all_variables, cf->pool, 32, - sizeof(ngx_http_variable_t)) == NGX_ERROR) + sizeof(ngx_http_variable_t)) + == NGX_ERROR) { return NGX_ERROR; } |