diff options
author | Igor Sysoev <igor@sysoev.ru> | 2005-05-12 18:58:06 +0400 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2005-05-12 18:58:06 +0400 |
commit | 899b44eab259f32af5c6e3da342f430c654528ce (patch) | |
tree | 23fb5dfbc9219030f9e102db5a2ce44e98c0a9d0 /src/http/ngx_http_log_module.c | |
parent | 22157ce9d570452b2d77f0fe7e510e6b0e4d05c2 (diff) |
nginx-0.1.29-RELEASE importrelease-0.1.29
*) Feature: the ngx_http_ssi_module supports "include virtual" command.
*) Feature: the ngx_http_ssi_module supports the condition command like
'if expr="$NAME"' and "else" and "endif" commands. Only one nested
level is supported.
*) Feature: the ngx_http_ssi_module supports the DATE_LOCAL and
DATE_GMT variables and "config timefmt" command.
*) Feature: the "ssi_ignore_recycled_buffers" directive.
*) Bugfix: the "echo" command did not show the default value for the
empty QUERY_STRING variable.
*) Change: the ngx_http_proxy_module was rewritten.
*) Feature: the "proxy_redirect", "proxy_pass_request_headers",
"proxy_pass_request_body", and "proxy_method" directives.
*) Feature: the "proxy_set_header" directive. The "proxy_x_var" was
canceled and must be replaced with the proxy_set_header directive.
*) Change: the "proxy_preserve_host" is canceled and must be replaced
with the "proxy_set_header Host $host" and the "proxy_redirect off"
directives, the "proxy_set_header Host $host:$proxy_port" directive
and the appropriate proxy_redirect directives.
*) Change: the "proxy_set_x_real_ip" is canceled and must be replaced
with the "proxy_set_header X-Real-IP $remote_addr" directive.
*) Change: the "proxy_add_x_forwarded_for" is canceled and must be
replaced with
the "proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for"
directive.
*) Change: the "proxy_set_x_url" is canceled and must be replaced with
the "proxy_set_header X-URL http://$host:$server_port$request_uri"
directive.
*) Feature: the "fastcgi_param" directive.
*) Change: the "fastcgi_root", "fastcgi_set_var" and "fastcgi_params"
directive are canceled and must be replaced with the fastcgi_param
directives.
*) Feature: the "index" directive can use the variables.
*) Feature: the "index" directive can be used at http and server levels.
*) Change: the last index only in the "index" directive can be absolute.
*) Feature: the "rewrite" directive can use the variables.
*) Feature: the "internal" directive.
*) Feature: the CONTENT_LENGTH, CONTENT_TYPE, REMOTE_PORT, SERVER_ADDR,
SERVER_PORT, SERVER_PROTOCOL, DOCUMENT_ROOT, SERVER_NAME,
REQUEST_METHOD, REQUEST_URI, and REMOTE_USER variables.
*) Change: nginx now passes the invalid lines in a client request
headers or a backend response header.
*) Bugfix: if the backend did not transfer response for a long time and
the "send_timeout" was less than "proxy_read_timeout", then nginx
returned the 408 response.
*) Bugfix: the segmentation fault was occurred if the backend sent an
invalid line in response header; the bug had appeared in 0.1.26.
*) Bugfix: the segmentation fault may occurred in FastCGI fault
tolerance configuration.
*) Bugfix: the "expires" directive did not remove the previous
"Expires" and "Cache-Control" headers.
*) Bugfix: nginx did not take into account trailing dot in "Host"
header line.
*) Bugfix: the ngx_http_auth_module did not work under Linux.
*) Bugfix: the rewrite directive worked incorrectly, if the arguments
were in a request.
*) Bugfix: nginx could not be built on MacOS X.
Diffstat (limited to 'src/http/ngx_http_log_module.c')
-rw-r--r-- | src/http/ngx_http_log_module.c | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/src/http/ngx_http_log_module.c b/src/http/ngx_http_log_module.c index 36a98ddf0..333472ecc 100644 --- a/src/http/ngx_http_log_module.c +++ b/src/http/ngx_http_log_module.c @@ -106,7 +106,8 @@ static ngx_command_t ngx_http_log_commands[] = { ngx_http_module_t ngx_http_log_module_ctx = { - ngx_http_log_set_formats, /* pre conf */ + ngx_http_log_set_formats, /* preconfiguration */ + NULL, /* postconfiguration */ ngx_http_log_create_main_conf, /* create main configuration */ NULL, /* init main configuration */ @@ -120,7 +121,7 @@ ngx_http_module_t ngx_http_log_module_ctx = { ngx_module_t ngx_http_log_module = { - NGX_MODULE, + NGX_MODULE_V1, &ngx_http_log_module_ctx, /* module context */ ngx_http_log_commands, /* module directives */ NGX_HTTP_MODULE, /* module type */ @@ -391,6 +392,11 @@ ngx_http_log_header_in_compile(ngx_conf_t *cf, ngx_http_log_op_t *op, continue; } + /* STUB: "Cookie" speacial handling */ + if (ngx_http_headers_in[i].offset == 0) { + continue; + } + if (ngx_strncasecmp(ngx_http_headers_in[i].name.data, value->data, value->len) == 0) { @@ -733,22 +739,17 @@ static ngx_int_t ngx_http_log_variable_compile(ngx_conf_t *cf, ngx_http_log_op_t *op, ngx_str_t *value) { - ngx_uint_t i; - ngx_http_variable_t *var; - - for (i = 0; i < value->len; i++) { - value->data[i] = ngx_toupper(value->data[i]); - } + ngx_int_t index; - var = ngx_http_add_variable(cf, value, 0); - if (var == NULL) { + index = ngx_http_get_variable_index(cf, value); + if (index == NGX_ERROR) { return NGX_ERROR; } op->len = 0; op->getlen = ngx_http_log_variable_getlen; op->run = ngx_http_log_variable; - op->data = var->index; + op->data = index; return NGX_OK; } @@ -762,7 +763,7 @@ ngx_http_log_variable_getlen(ngx_http_request_t *r, uintptr_t data) value = ngx_http_get_indexed_variable(r, data); if (value == NULL - || value == NGX_HTTP_VARIABLE_NOT_FOUND + || value == NGX_HTTP_VAR_NOT_FOUND || value->text.len == 0) { return 1; @@ -780,7 +781,7 @@ ngx_http_log_variable(ngx_http_request_t *r, u_char *buf, ngx_http_log_op_t *op) value = ngx_http_get_indexed_variable(r, op->data); if (value == NULL - || value == NGX_HTTP_VARIABLE_NOT_FOUND + || value == NGX_HTTP_VAR_NOT_FOUND || value->text.len == 0) { *buf = '-'; |