nginx-vendor-current: src/http/ngx_http_log

comparison src/http/ngx_http_log_handler.c @ 28:7ca9bdc82b3f NGINX_0_1_14

nginx 0.1.14 *) Feature: the autoconfiguration directives: --http-client-body-temp-path=PATH, --http-proxy-temp-path=PATH, and --http-fastcgi-temp-path=PATH *) Change: the directory name for the temporary files with the client request body is specified by directive client_body_temp_path, by default it is <prefix>/client_body_temp. *) Feature: the ngx_http_fastcgi_module and the directives: fastcgi_pass, fastcgi_root, fastcgi_index, fastcgi_params, fastcgi_connect_timeout, fastcgi_send_timeout, fastcgi_read_timeout, fastcgi_send_lowat, fastcgi_header_buffer_size, fastcgi_buffers, fastcgi_busy_buffers_size, fastcgi_temp_path, fastcgi_max_temp_file_size, fastcgi_temp_file_write_size, fastcgi_next_upstream, and fastcgi_x_powered_by. *) Bugfix: the "[alert] zero size buf" error; bug appeared in 0.1.3. *) Change: the URI must be specified after the host name in the proxy_pass directive. *) Change: the %3F symbol in the URI was considered as the argument string start. *) Feature: the unix domain sockets support in the ngx_http_proxy_module. *) Feature: the ssl_engine and ssl_ciphers directives. Thanks to Sergey Skvortsov for SSL-accelerator.

author	Igor Sysoev <http://sysoev.ru>
date	Tue, 18 Jan 2005 00:00:00 +0300
parents	45fe5b98a9de
children	aab2ea7c0458

comparison

equal deleted inserted replaced

-:66901c2556fd
+:7ca9bdc82b3f
 #include <ngx_http.h>
 #include <nginx.h>
 static u_char *ngx_http_log_addr(ngx_http_request_t *r, u_char *buf,
-uintptr_t data);
+ngx_http_log_op_t *op);
 static u_char *ngx_http_log_connection(ngx_http_request_t *r, u_char *buf,
-uintptr_t data);
+ngx_http_log_op_t *op);
 static u_char *ngx_http_log_pipe(ngx_http_request_t *r, u_char *buf,
-uintptr_t data);
+ngx_http_log_op_t *op);
 static u_char *ngx_http_log_time(ngx_http_request_t *r, u_char *buf,
-uintptr_t data);
+ngx_http_log_op_t *op);
 static u_char *ngx_http_log_msec(ngx_http_request_t *r, u_char *buf,
-uintptr_t data);
+ngx_http_log_op_t *op);
+static u_char *ngx_http_log_status(ngx_http_request_t *r, u_char *buf,
+ngx_http_log_op_t *op);
+static u_char *ngx_http_log_length(ngx_http_request_t *r, u_char *buf,
+ngx_http_log_op_t *op);
+static u_char *ngx_http_log_apache_length(ngx_http_request_t *r, u_char *buf,
+ngx_http_log_op_t *op);
+static u_char *ngx_http_log_request_length(ngx_http_request_t *r, u_char *buf,
+ngx_http_log_op_t *op);
+static size_t ngx_http_log_request_getlen(ngx_http_request_t *r,
+uintptr_t data);
 static u_char *ngx_http_log_request(ngx_http_request_t *r, u_char *buf,
-uintptr_t data);
+ngx_http_log_op_t *op);
-static u_char *ngx_http_log_status(ngx_http_request_t *r, u_char *buf,
-uintptr_t data);
+static ngx_int_t ngx_http_log_header_in_compile(ngx_http_log_op_t *op,
-static u_char *ngx_http_log_length(ngx_http_request_t *r, u_char *buf,
+ngx_str_t *value);
-uintptr_t data);
+static size_t ngx_http_log_header_in_getlen(ngx_http_request_t *r,
-static u_char *ngx_http_log_apache_length(ngx_http_request_t *r, u_char *buf,
+uintptr_t data);
-uintptr_t data);
-static u_char *ngx_http_log_request_length(ngx_http_request_t *r, u_char *buf,
-uintptr_t data);
 static u_char *ngx_http_log_header_in(ngx_http_request_t *r, u_char *buf,
-uintptr_t data);
+ngx_http_log_op_t *op);
+static size_t ngx_http_log_unknown_header_in_getlen(ngx_http_request_t *r,
+uintptr_t data);
+static u_char *ngx_http_log_unknown_header_in(ngx_http_request_t *r,
+u_char *buf,
+ngx_http_log_op_t *op);
+static ngx_int_t ngx_http_log_header_out_compile(ngx_http_log_op_t *op,
+ngx_str_t *value);
+static size_t ngx_http_log_header_out_getlen(ngx_http_request_t *r,
+uintptr_t data);
+static u_char *ngx_http_log_header_out(ngx_http_request_t *r, u_char *buf,
+ngx_http_log_op_t *op);
+static size_t ngx_http_log_unknown_header_out_getlen(ngx_http_request_t *r,
+uintptr_t data);
+static u_char *ngx_http_log_unknown_header_out(ngx_http_request_t *r,
+u_char *buf,
+ngx_http_log_op_t *op);
 static u_char *ngx_http_log_connection_header_out(ngx_http_request_t *r,
-u_char *buf, uintptr_t data);
+u_char *buf,
+ngx_http_log_op_t *op);
 static u_char *ngx_http_log_transfer_encoding_header_out(ngx_http_request_t *r,
 u_char *buf,
-uintptr_t data);
+ngx_http_log_op_t *op);
-static u_char *ngx_http_log_unknown_header_in(ngx_http_request_t *r,
-u_char *buf, uintptr_t data);
+static ngx_table_elt_t *ngx_http_log_unknown_header(ngx_list_t *headers,
-static u_char *ngx_http_log_header_out(ngx_http_request_t *r, u_char *buf,
+ngx_str_t *value);
-uintptr_t data);
-static u_char *ngx_http_log_unknown_header_out(ngx_http_request_t *r, u_char *buf,
+static ngx_int_t ngx_http_log_set_formats(ngx_conf_t *cf);
-uintptr_t data);
-static ngx_int_t ngx_http_log_pre_conf(ngx_conf_t *cf);
 static void *ngx_http_log_create_main_conf(ngx_conf_t *cf);
 static void *ngx_http_log_create_loc_conf(ngx_conf_t *cf);
 static char *ngx_http_log_merge_loc_conf(ngx_conf_t *cf, void *parent,
 void *child);
 static char *ngx_http_log_set_log(ngx_conf_t *cf, ngx_command_t *cmd,
 ngx_null_command
 };
 ngx_http_module_t  ngx_http_log_module_ctx = {
-ngx_http_log_pre_conf,                 /* pre conf */
+ngx_http_log_set_formats,              /* pre conf */
 ngx_http_log_create_main_conf,         /* create main configuration */
 NULL,                                  /* init main configuration */
 NULL,                                  /* create server configuration */
 ngx_string("%addr - - [%time] \"%request\" %status %apache_length "
 "\"%{Referer}i\" \"%{User-Agent}i\"");
 ngx_http_log_op_name_t ngx_http_log_fmt_ops[] = {
-{ ngx_string("addr"), INET_ADDRSTRLEN - 1, ngx_http_log_addr },
+{ ngx_string("addr"), INET_ADDRSTRLEN - 1, NULL, NULL, ngx_http_log_addr },
-{ ngx_string("conn"), NGX_INT32_LEN, ngx_http_log_connection },
+{ ngx_string("conn"), NGX_INT32_LEN, NULL, NULL, ngx_http_log_connection },
-{ ngx_string("pipe"), 1, ngx_http_log_pipe },
+{ ngx_string("pipe"), 1, NULL, NULL, ngx_http_log_pipe },
 { ngx_string("time"), sizeof("28/Sep/1970:12:00:00") - 1,
-ngx_http_log_time },
+NULL, NULL, ngx_http_log_time },
-{ ngx_string("msec"), NGX_TIME_T_LEN + 4, ngx_http_log_msec },
+{ ngx_string("msec"), NGX_TIME_T_LEN + 4, NULL, NULL, ngx_http_log_msec },
-{ ngx_string("request"), 0, ngx_http_log_request },
+{ ngx_string("status"), 3, NULL, NULL, ngx_http_log_status },
-{ ngx_string("status"), 3, ngx_http_log_status },
+{ ngx_string("length"), NGX_OFF_T_LEN, NULL, NULL, ngx_http_log_length },
-{ ngx_string("length"), NGX_OFF_T_LEN, ngx_http_log_length },
+{ ngx_string("apache_length"), NGX_OFF_T_LEN,
-{ ngx_string("apache_length"), NGX_OFF_T_LEN, ngx_http_log_apache_length },
+NULL, NULL, ngx_http_log_apache_length },
 { ngx_string("request_length"), NGX_SIZE_T_LEN,
-ngx_http_log_request_length },
+NULL, NULL, ngx_http_log_request_length },
-{ ngx_string("i"), NGX_HTTP_LOG_ARG, ngx_http_log_header_in },
-{ ngx_string("o"), NGX_HTTP_LOG_ARG, ngx_http_log_header_out },
+{ ngx_string("request"), 0, NULL,
-{ ngx_null_string, 0, NULL }
+ngx_http_log_request_getlen,
+ngx_http_log_request },
+{ ngx_string("i"), 0, ngx_http_log_header_in_compile,
+ngx_http_log_header_in_getlen,
+ngx_http_log_header_in },
+{ ngx_string("o"), 0, ngx_http_log_header_out_compile,
+ngx_http_log_header_out_getlen,
+ngx_http_log_header_out },
+{ ngx_null_string, 0, NULL, NULL, NULL }
 };
 ngx_int_t ngx_http_log_handler(ngx_http_request_t *r)
 {
 ngx_uint_t                i, l;
-uintptr_t                 data;
 u_char                   *line, *p;
 size_t                    len;
 ngx_http_log_t           *log;
 ngx_http_log_op_t        *op;
 ngx_http_log_loc_conf_t  *lcf;
 len = 0;
 op = log[l].ops->elts;
 for (i = 0; i < log[l].ops->nelts; i++) {
 if (op[i].len == 0) {
-len += (size_t) op[i].op(r, NULL, op[i].data);
+len += op[i].getlen(r, op[i].data);
 } else {
 len += op[i].len;
 }
 }
 }
 p = line;
 for (i = 0; i < log[l].ops->nelts; i++) {
-if (op[i].op == NGX_HTTP_LOG_COPY_SHORT) {
+p = op[i].run(r, p, &op[i]);
-len = op[i].len;
-data = op[i].data;
-while (len--) {
-*p++ = (char) (data & 0xff);
-data >>= 8;
-}
-} else if (op[i].op == NGX_HTTP_LOG_COPY_LONG) {
-p = ngx_cpymem(p, (void *) op[i].data, op[i].len);
-} else {
-p = op[i].op(r, p, op[i].data);
-}
 }
 #if (NGX_WIN32)
 *p++ = CR; *p++ = LF;
 WriteFile(log[l].file->fd, line, p - line, &written, NULL);
 return NGX_OK;
 }
+static u_char *ngx_http_log_copy_short(ngx_http_request_t *r, u_char *buf,
+ngx_http_log_op_t *op)
+{
+size_t     len;
+uintptr_t  data;
+len = op->len;
+data = op->data;
+while (len--) {
+*buf++ = (u_char) (data & 0xff);
+data >>= 8;
+}
+return buf;
+}
+static u_char *ngx_http_log_copy_long(ngx_http_request_t *r, u_char *buf,
+ngx_http_log_op_t *op)
+{
+return ngx_cpymem(buf, (u_char *) op->data, op->len);
+}
 static u_char *ngx_http_log_addr(ngx_http_request_t *r, u_char *buf,
-uintptr_t data)
+ngx_http_log_op_t *op)
 {
 return ngx_cpymem(buf, r->connection->addr_text.data,
 r->connection->addr_text.len);
 }
 static u_char *ngx_http_log_connection(ngx_http_request_t *r, u_char *buf,
-uintptr_t data)
+ngx_http_log_op_t *op)
 {
 return ngx_sprintf(buf, "%ui", r->connection->number);
 }
 static u_char *ngx_http_log_pipe(ngx_http_request_t *r, u_char *buf,
-uintptr_t data)
+ngx_http_log_op_t *op)
 {
 if (r->pipeline) {
 *buf = 'p';
 } else {
 *buf = '.';
 return buf + 1;
 }
 static u_char *ngx_http_log_time(ngx_http_request_t *r, u_char *buf,
-uintptr_t data)
+ngx_http_log_op_t *op)
 {
 return ngx_cpymem(buf, ngx_cached_http_log_time.data,
 ngx_cached_http_log_time.len);
 }
 static u_char *ngx_http_log_msec(ngx_http_request_t *r, u_char *buf,
-uintptr_t data)
+ngx_http_log_op_t *op)
 {
 struct timeval  tv;
 ngx_gettimeofday(&tv);
 return ngx_sprintf(buf, "%l.%03l", tv.tv_sec, tv.tv_usec / 1000);
 }
+static size_t ngx_http_log_request_getlen(ngx_http_request_t *r,
+uintptr_t data)
+{
+return r->request_line.len;
+}
 static u_char *ngx_http_log_request(ngx_http_request_t *r, u_char *buf,
-uintptr_t data)
+ngx_http_log_op_t *op)
 {
-if (buf == NULL) {
-/* find the request line length */
-return (u_char *) r->request_line.len;
-}
 return ngx_cpymem(buf, r->request_line.data, r->request_line.len);
 }
 static u_char *ngx_http_log_status(ngx_http_request_t *r, u_char *buf,
-uintptr_t data)
+ngx_http_log_op_t *op)
 {
 return ngx_sprintf(buf, "%ui",
 r->err_status ? r->err_status : r->headers_out.status);
 }
 static u_char *ngx_http_log_length(ngx_http_request_t *r, u_char *buf,
-uintptr_t data)
+ngx_http_log_op_t *op)
 {
 return ngx_sprintf(buf, "%O", r->connection->sent);
 }
 static u_char *ngx_http_log_apache_length(ngx_http_request_t *r, u_char *buf,
-uintptr_t data)
+ngx_http_log_op_t *op)
 {
 return ngx_sprintf(buf, "%O", r->connection->sent - r->header_size);
 }
 static u_char *ngx_http_log_request_length(ngx_http_request_t *r, u_char *buf,
-uintptr_t data)
+ngx_http_log_op_t *op)
 {
 return ngx_sprintf(buf, "%z", r->request_length);
 }
+static ngx_int_t ngx_http_log_header_in_compile(ngx_http_log_op_t *op,
+ngx_str_t *value)
+{
+ngx_uint_t  i;
+op->len = 0;
+for (i = 0; ngx_http_headers_in[i].name.len != 0; i++) {
+if (ngx_http_headers_in[i].name.len != value->len) {
+continue;
+}
+if (ngx_strncasecmp(ngx_http_headers_in[i].name.data, value->data,
+value->len) == 0)
+{
+op->getlen = ngx_http_log_header_in_getlen;
+op->run = ngx_http_log_header_in;
+op->data = ngx_http_headers_in[i].offset;
+return NGX_OK;
+}
+}
+op->getlen = ngx_http_log_unknown_header_in_getlen;
+op->run = ngx_http_log_unknown_header_in;
+op->data = (uintptr_t) value;
+return NGX_OK;
+}
+static size_t ngx_http_log_header_in_getlen(ngx_http_request_t *r,
+uintptr_t data)
+{
+ngx_table_elt_t  *h;
+h = *(ngx_table_elt_t **) ((char *) &r->headers_in + data);
+if (h) {
+return h->value.len;
+}
+return 1;
+}
 static u_char *ngx_http_log_header_in(ngx_http_request_t *r, u_char *buf,
-uintptr_t data)
+ngx_http_log_op_t *op)
 {
-ngx_uint_t          i;
+ngx_table_elt_t  *h;
-ngx_str_t          *s;
-ngx_table_elt_t    *h;
+h = *(ngx_table_elt_t **) ((char *) &r->headers_in + op->data);
-ngx_http_log_op_t  *op;
+if (h) {
-if (r) {
+return ngx_cpymem(buf, h->value.data, h->value.len);
-h = *(ngx_table_elt_t **) ((char *) &r->headers_in + data);
+}
-if (h == NULL) {
+*buf = '-';
-/* no header */
+return buf + 1;
+}
-if (buf) {
-*buf = '-';
-}
+static size_t ngx_http_log_unknown_header_in_getlen(ngx_http_request_t *r,
+uintptr_t data)
+{
+ngx_table_elt_t  *h;
+h = ngx_http_log_unknown_header(&r->headers_in.headers, (ngx_str_t *) data);
+if (h) {
+return h->value.len;
+}
+return 1;
+}
+static u_char *ngx_http_log_unknown_header_in(ngx_http_request_t *r,
+u_char *buf,
+ngx_http_log_op_t *op)
+{
+ngx_table_elt_t  *h;
+h = ngx_http_log_unknown_header(&r->headers_in.headers,
+(ngx_str_t *) op->data);
+if (h) {
+return ngx_cpymem(buf, h->value.data, h->value.len);
+}
+*buf = '-';
+return buf + 1;
+}
+static ngx_int_t ngx_http_log_header_out_compile(ngx_http_log_op_t *op,
+ngx_str_t *value)
+{
+ngx_uint_t  i;
+op->len = 0;
+for (i = 0; ngx_http_headers_out[i].name.len != 0; i++) {
+if (ngx_http_headers_out[i].name.len != value->len) {
+continue;
+}
+if (ngx_strncasecmp(ngx_http_headers_out[i].name.data, value->data,
+value->len) == 0)
+{
+op->getlen = ngx_http_log_header_out_getlen;
+op->run = ngx_http_log_header_out;
+op->data = ngx_http_headers_out[i].offset;
+return NGX_OK;
+}
+}
+if (value->len == sizeof("Connection") - 1
+&& ngx_strncasecmp(value->data, "Connection", value->len) == 0)
+{
+op->len = sizeof("keep-alive") - 1;
+op->getlen = NULL;
+op->run = ngx_http_log_connection_header_out;
+op->data = 0;
+return NGX_OK;
+}
+if (value->len == sizeof("Transfer-Encoding") - 1
+&& ngx_strncasecmp(value->data, "Transfer-Encoding", value->len) == 0)
+{
+op->len = sizeof("chunked") - 1;
+op->getlen = NULL;
+op->run = ngx_http_log_transfer_encoding_header_out;
+op->data = 0;
+return NGX_OK;
+}
+op->getlen = ngx_http_log_unknown_header_out_getlen;
+op->run = ngx_http_log_unknown_header_out;
+op->data = (uintptr_t) value;
+return NGX_OK;
+}
+static size_t ngx_http_log_header_out_getlen(ngx_http_request_t *r,
+uintptr_t data)
+{
+ngx_table_elt_t  *h;
+h = *(ngx_table_elt_t **) ((char *) &r->headers_out + data);
+if (h) {
+return h->value.len;
+}
+/*
+* No header pointer was found.
+* However, some headers: "Date", "Server", "Content-Length",
+* and "Last-Modified" have a special handling in the header filter
+* but we do not set up their pointers in the filter because
+* they are too seldom needed to be logged.
+*/
+if (data == offsetof(ngx_http_headers_out_t, date)) {
+return ngx_cached_http_time.len;
+}
+if (data == offsetof(ngx_http_headers_out_t, server)) {
+return (sizeof(NGINX_VER) - 1);
+}
+if (data == offsetof(ngx_http_headers_out_t, content_length)) {
+if (r->headers_out.content_length_n == -1) {
+return 1;
+}
+return NGX_OFF_T_LEN;
+}
+if (data == offsetof(ngx_http_headers_out_t, last_modified)) {
+if (r->headers_out.last_modified_time == -1) {
+return 1;
+}
+return sizeof("Mon, 28 Sep 1970 06:00:00 GMT") - 1;
+}
+return 1;
+}
+static u_char *ngx_http_log_header_out(ngx_http_request_t *r, u_char *buf,
+ngx_http_log_op_t *op)
+{
+ngx_table_elt_t  *h;
+h = *(ngx_table_elt_t **) ((char *) &r->headers_out + op->data);
+if (h) {
+return ngx_cpymem(buf, h->value.data, h->value.len);
+}
+/*
+* No header pointer was found.
+* However, some headers: "Date", "Server", "Content-Length",
+* and "Last-Modified" have a special handling in the header filter
+* but we do not set up their pointers in the filter because
+* they are too seldom needed to be logged.
+*/
+if (op->data == offsetof(ngx_http_headers_out_t, date)) {
+return ngx_cpymem(buf, ngx_cached_http_time.data,
+ngx_cached_http_time.len);
+}
+if (op->data == offsetof(ngx_http_headers_out_t, server)) {
+return ngx_cpymem(buf, NGINX_VER, sizeof(NGINX_VER) - 1);
+}
+if (op->data == offsetof(ngx_http_headers_out_t, content_length)) {
+if (r->headers_out.content_length_n == -1) {
+*buf = '-';
 return buf + 1;
 }
-if (buf == NULL) {
+return ngx_sprintf(buf, "%O", r->headers_out.content_length_n);
-/* find the header length */
+}
-return (u_char *) h->value.len;
-}
+if (op->data == offsetof(ngx_http_headers_out_t, last_modified)) {
+if (r->headers_out.last_modified_time == -1) {
+*buf = '-';
+return buf + 1;
+}
+return ngx_http_time(buf, r->headers_out.last_modified_time);
+}
+*buf = '-';
+return buf + 1;
+}
+static size_t ngx_http_log_unknown_header_out_getlen(ngx_http_request_t *r,
+uintptr_t data)
+{
+ngx_table_elt_t  *h;
+h = ngx_http_log_unknown_header(&r->headers_out.headers,
+(ngx_str_t *) data);
+if (h) {
+return h->value.len;
+}
+return 1;
+}
+static u_char *ngx_http_log_unknown_header_out(ngx_http_request_t *r,
+u_char *buf,
+ngx_http_log_op_t *op)
+{
+ngx_table_elt_t  *h;
+h = ngx_http_log_unknown_header(&r->headers_out.headers,
+(ngx_str_t *) op->data);
+if (h) {
 return ngx_cpymem(buf, h->value.data, h->value.len);
 }
-/* find an offset while a format string compilation */
+*buf = '-';
-op = (ngx_http_log_op_t *) buf;
+return buf + 1;
-s = (ngx_str_t *) data;
+}
-op->len = 0;
+static ngx_table_elt_t *ngx_http_log_unknown_header(ngx_list_t *headers,
-for (i = 0; ngx_http_headers_in[i].name.len != 0; i++) {
+ngx_str_t *value)
-if (ngx_http_headers_in[i].name.len != s->len) {
-continue;
-}
-if (ngx_strncasecmp(ngx_http_headers_in[i].name.data, s->data, s->len)
-== 0)
-{
-op->op = ngx_http_log_header_in;
-op->data = ngx_http_headers_in[i].offset;
-return NULL;
-}
-}
-op->op = ngx_http_log_unknown_header_in;
-op->data = (uintptr_t) s;
-return NULL;
-}
-static u_char *ngx_http_log_unknown_header_in(ngx_http_request_t *r,
-u_char *buf, uintptr_t data)
 {
 ngx_uint_t        i;
-ngx_str_t        *s;
 ngx_list_part_t  *part;
 ngx_table_elt_t  *h;
-s = (ngx_str_t *) data;
+part = &headers->part;
-part = &r->headers_in.headers.part;
 h = part->elts;
 for (i = 0; /* void */; i++) {
 if (i >= part->nelts) {
 part = part->next;
 h = part->elts;
 i = 0;
 }
-if (h[i].key.len != s->len) {
+if (h[i].key.len != value->len) {
 continue;
 }
-if (ngx_strncasecmp(h[i].key.data, s->data, s->len) == 0) {
+if (ngx_strncasecmp(h[i].key.data, value->data, value->len) == 0) {
-if (buf == NULL) {
+return &h[i];
-/* find the header length */
+}
-return (u_char *) h[i].value.len;
+}
-}
-return ngx_cpymem(buf, h[i].value.data, h[i].value.len);
-}
-}
-/* no header */
-if (buf) {
-*buf = '-';
-}
-return buf + 1;
-}
-static u_char *ngx_http_log_header_out(ngx_http_request_t *r, u_char *buf,
-uintptr_t data)
-{
-ngx_uint_t          i;
-ngx_str_t          *s;
-ngx_table_elt_t    *h;
-ngx_http_log_op_t  *op;
-if (r) {
-/* run-time execution */
-if (r->http_version < NGX_HTTP_VERSION_10) {
-if (buf) {
-*buf = '-';
-}
-return buf + 1;
-}
-h = *(ngx_table_elt_t **) ((char *) &r->headers_out + data);
-if (h == NULL) {
-/*
-* No header pointer was found.
-* However, some headers: "Date", "Server", "Content-Length",
-* and "Last-Modified" have a special handling in the header filter
-* but we do not set up their pointers in the filter because
-* they are too seldom needed to be logged.
-*/
-if (data == offsetof(ngx_http_headers_out_t, date)) {
-if (buf == NULL) {
-return (u_char *) ngx_cached_http_time.len;
-}
-return ngx_cpymem(buf, ngx_cached_http_time.data,
-ngx_cached_http_time.len);
-}
-if (data == offsetof(ngx_http_headers_out_t, server)) {
-if (buf == NULL) {
-return (u_char *) (sizeof(NGINX_VER) - 1);
-}
-return ngx_cpymem(buf, NGINX_VER, sizeof(NGINX_VER) - 1);
-}
-if (data == offsetof(ngx_http_headers_out_t, content_length)) {
-if (r->headers_out.content_length_n == -1) {
-if (buf) {
-*buf = '-';
-}
-return buf + 1;
-}
-if (buf == NULL) {
-return (u_char *) NGX_OFF_T_LEN;
-}
-return ngx_sprintf(buf, "%O", r->headers_out.content_length_n);
-}
-if (data == offsetof(ngx_http_headers_out_t, last_modified)) {
-if (r->headers_out.last_modified_time == -1) {
-if (buf) {
-*buf = '-';
-}
-return buf + 1;
-}
-if (buf == NULL) {
-return (u_char *)
-sizeof("Mon, 28 Sep 1970 06:00:00 GMT") - 1;
-}
-return ngx_http_time(buf, r->headers_out.last_modified_time);
-}
-if (buf) {
-*buf = '-';
-}
-return buf + 1;
-}
-if (buf == NULL) {
-/* find the header length */
-return (u_char *) h->value.len;
-}
-return ngx_cpymem(buf, h->value.data, h->value.len);
-}
-/* find an offset while a format string compilation */
-op = (ngx_http_log_op_t *) buf;
-s = (ngx_str_t *) data;
-op->len = 0;
-for (i = 0; ngx_http_headers_out[i].name.len != 0; i++) {
-if (ngx_http_headers_out[i].name.len != s->len) {
-continue;
-}
-if (ngx_strncasecmp(ngx_http_headers_out[i].name.data, s->data, s->len)
-== 0)
-{
-op->op = ngx_http_log_header_out;
-op->data = ngx_http_headers_out[i].offset;
-return NULL;
-}
-}
-if (s->len == sizeof("Connection") - 1
-&& ngx_strncasecmp(s->data, "Connection", s->len) == 0)
-{
-op->op = ngx_http_log_connection_header_out;
-op->data = (uintptr_t) NULL;
-return NULL;
-}
-if (s->len == sizeof("Transfer-Encoding") - 1
-&& ngx_strncasecmp(s->data, "Transfer-Encoding", s->len) == 0) {
-op->op = ngx_http_log_transfer_encoding_header_out;
-op->data = (uintptr_t) NULL;
-return NULL;
-}
-op->op = ngx_http_log_unknown_header_out;
-op->data = (uintptr_t) s;
 return NULL;
 }
 static u_char *ngx_http_log_connection_header_out(ngx_http_request_t *r,
-u_char *buf, uintptr_t data)
+u_char *buf,
-{
+ngx_http_log_op_t *op)
-if (buf == NULL) {
+{
-return (u_char *) ((r->keepalive) ? sizeof("keep-alive") - 1:
-sizeof("close") - 1);
-}
 if (r->keepalive) {
 return ngx_cpymem(buf, "keep-alive", sizeof("keep-alive") - 1);
 } else {
 return ngx_cpymem(buf, "close", sizeof("close") - 1);
 }
 static u_char *ngx_http_log_transfer_encoding_header_out(ngx_http_request_t *r,
 u_char *buf,
-uintptr_t data)
+ngx_http_log_op_t *op)
 {
-if (buf == NULL) {
-return (u_char *) ((r->chunked) ? sizeof("chunked") - 1 : 1);
-}
 if (r->chunked) {
 return ngx_cpymem(buf, "chunked", sizeof("chunked") - 1);
 }
 *buf = '-';
 return buf + 1;
 }
-static u_char *ngx_http_log_unknown_header_out(ngx_http_request_t *r,
+static ngx_int_t ngx_http_log_set_formats(ngx_conf_t *cf)
-u_char *buf,
-uintptr_t data)
-{
-ngx_uint_t        i;
-ngx_str_t        *s;
-ngx_list_part_t  *part;
-ngx_table_elt_t  *h;
-s = (ngx_str_t *) data;
-part = &r->headers_out.headers.part;
-h = part->elts;
-for (i = 0; /* void */; i++) {
-if (i >= part->nelts) {
-if (part->next == NULL) {
-break;
-}
-part = part->next;
-h = part->elts;
-i = 0;
-}
-if (h[i].key.len != s->len) {
-continue;
-}
-if (ngx_strncasecmp(h[i].key.data, s->data, s->len) == 0) {
-if (buf == NULL) {
-/* find the header length */
-return (u_char *) h[i].value.len;
-}
-return ngx_cpymem(buf, h[i].value.data, h[i].value.len);
-}
-}
-/* no header */
-if (buf) {
-*buf = '-';
-}
-return buf + 1;
-}
-static ngx_int_t ngx_http_log_pre_conf(ngx_conf_t *cf)
 {
 ngx_http_log_op_name_t  *op;
 for (op = ngx_http_log_fmt_ops; op->name.len; op++) { /* void */ }
-op->op = NULL;
+op->run = NULL;
 return NGX_OK;
 }
 if (fname_len == 0) {
 invalid = 1;
 break;
 }
-for (name = ngx_http_log_fmt_ops; name->op; name++) {
+for (name = ngx_http_log_fmt_ops; name->run; name++) {
 if (name->name.len == 0) {
-name = (ngx_http_log_op_name_t *) name->op;
+name = (ngx_http_log_op_name_t *) name->run;
 }
 if (name->name.len == fname_len
 && ngx_strncmp(name->name.data, fname, fname_len) == 0)
 {
-if (name->len != NGX_HTTP_LOG_ARG) {
+if (name->compile == NULL) {
 if (arg.len) {
 fname[fname_len] = '\0';
 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
 "\"%s\" must not have argument",
 data);
 return NGX_CONF_ERROR;
 }
 op->len = name->len;
-op->op = name->op;
+op->getlen = name->getlen;
+op->run = name->run;
 op->data = 0;
 break;
 }
 if (!(a = ngx_palloc(cf->pool, sizeof(ngx_str_t)))) {
 return NGX_CONF_ERROR;
 }
 *a = arg;
-name->op(NULL, (u_char *) op, (uintptr_t) a);
+if (name->compile(op, a) == NGX_ERROR) {
+return NGX_CONF_ERROR;
+}
 break;
 }
 }
 len = &value[s].data[i] - data;
 if (len) {
 op->len = len;
+op->getlen = NULL;
 if (len <= sizeof(uintptr_t)) {
-op->op = NGX_HTTP_LOG_COPY_SHORT;
+op->run = ngx_http_log_copy_short;
 op->data = 0;
 while (len--) {
 op->data <<= 8;
 op->data |= data[len];
 }
 } else {
-op->op = NGX_HTTP_LOG_COPY_LONG;
+op->run = ngx_http_log_copy_long;
 if (!(p = ngx_palloc(cf->pool, len))) {
 return NGX_CONF_ERROR;
 }

Mercurial > hg > nginx-vendor-current

comparison src/http/ngx_http_log_handler.c @ 28:7ca9bdc82b3f NGINX_0_1_14