comparison src/http/ngx_http_variables.c @ 569:174f1e853e1e release-0.3.6

nginx-0.3.6-RELEASE import *) 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.
author Igor Sysoev <igor@sysoev.ru>
date Mon, 24 Oct 2005 15:09:41 +0000
parents e48ebafc6939
children 458b6c3fea65
comparison
equal deleted inserted replaced
568:91e400506e99 569:174f1e853e1e
94 { ngx_string("request_uri"), ngx_http_variable_request, 94 { ngx_string("request_uri"), ngx_http_variable_request,
95 offsetof(ngx_http_request_t, unparsed_uri), 0, 0 }, 95 offsetof(ngx_http_request_t, unparsed_uri), 0, 0 },
96 96
97 { ngx_string("document_uri"), ngx_http_variable_request, 97 { ngx_string("document_uri"), ngx_http_variable_request,
98 offsetof(ngx_http_request_t, uri), 0, 0 }, 98 offsetof(ngx_http_request_t, uri), 0, 0 },
99
100 { ngx_string("request"), ngx_http_variable_request,
101 offsetof(ngx_http_request_t, request_line), 0, 0 },
99 102
100 { ngx_string("document_root"), ngx_http_variable_document_root, 0, 0, 0 }, 103 { ngx_string("document_root"), ngx_http_variable_document_root, 0, 0, 0 },
101 104
102 { ngx_string("query_string"), ngx_http_variable_request, 105 { ngx_string("query_string"), ngx_http_variable_request,
103 offsetof(ngx_http_request_t, args), 106 offsetof(ngx_http_request_t, args),
703 ngx_http_core_main_conf_t *cmcf; 706 ngx_http_core_main_conf_t *cmcf;
704 707
705 cmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_core_module); 708 cmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_core_module);
706 709
707 if (ngx_array_init(&cmcf->all_variables, cf->pool, 32, 710 if (ngx_array_init(&cmcf->all_variables, cf->pool, 32,
708 sizeof(ngx_http_variable_t)) == NGX_ERROR) 711 sizeof(ngx_http_variable_t))
712 == NGX_ERROR)
709 { 713 {
710 return NGX_ERROR; 714 return NGX_ERROR;
711 } 715 }
712 716
713 for (cv = ngx_http_core_variables; cv->name.len; cv++) { 717 for (cv = ngx_http_core_variables; cv->name.len; cv++) {