nginx-vendor-current: src/http/modules/ngx_http_log

comparison src/http/modules/ngx_http_log_module.c @ 694:88a1b4797f2e NGINX_1_3_10

nginx 1.3.10 *) Change: domain names specified in configuration file are now resolved to IPv6 addresses as well as IPv4 ones. *) Change: now if the "include" directive with mask is used on Unix systems, included files are sorted in alphabetical order. *) Change: the "add_header" directive adds headers to 201 responses. *) Feature: the "geo" directive now supports IPv6 addresses in CIDR notation. *) Feature: the "flush" and "gzip" parameters of the "access_log" directive. *) Feature: variables support in the "auth_basic" directive. *) Bugfix: nginx could not be built with the ngx_http_perl_module in some cases. *) Bugfix: a segmentation fault might occur in a worker process if the ngx_http_xslt_module was used. *) Bugfix: nginx could not be built on MacOSX in some cases. Thanks to Piotr Sikora. *) Bugfix: the "limit_rate" directive with high rates might result in truncated responses on 32-bit platforms. Thanks to Alexey Antropov. *) Bugfix: a segmentation fault might occur in a worker process if the "if" directive was used. Thanks to Piotr Sikora. *) Bugfix: a "100 Continue" response was issued with "413 Request Entity Too Large" responses. *) Bugfix: the "image_filter", "image_filter_jpeg_quality" and "image_filter_sharpen" directives might be inherited incorrectly. Thanks to Ian Babrou. *) Bugfix: "crypt_r() failed" errors might appear if the "auth_basic" directive was used on Linux. *) Bugfix: in backup servers handling. Thanks to Thomas Chen. *) Bugfix: proxied HEAD requests might return incorrect response if the "gzip" directive was used.

author	Igor Sysoev <http://sysoev.ru>
date	Tue, 25 Dec 2012 00:00:00 +0400
parents	b5b7eea22fda
children

comparison

equal deleted inserted replaced

-:cfd4279acc6e
+:88a1b4797f2e
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_http.h>
+#if (NGX_ZLIB)
+#include <zlib.h>
+#endif
 typedef struct ngx_http_log_op_s  ngx_http_log_op_t;
 typedef u_char *(*ngx_http_log_op_run_pt) (ngx_http_request_t *r, u_char *buf,
 typedef struct {
 ngx_array_t                 formats;    /* array of ngx_http_log_fmt_t */
 ngx_uint_t                  combined_used; /* unsigned  combined_used:1 */
 } ngx_http_log_main_conf_t;
+typedef struct {
+u_char                     *start;
+u_char                     *pos;
+u_char                     *last;
+ngx_event_t                *event;
+ngx_msec_t                  flush;
+ngx_int_t                   gzip;
+} ngx_http_log_buf_t;
 typedef struct {
 ngx_array_t                *lengths;
 ngx_array_t                *values;
 static void ngx_http_log_write(ngx_http_request_t *r, ngx_http_log_t *log,
 u_char *buf, size_t len);
 static ssize_t ngx_http_log_script_write(ngx_http_request_t *r,
 ngx_http_log_script_t *script, u_char **name, u_char *buf, size_t len);
+#if (NGX_ZLIB)
+static ssize_t ngx_http_log_gzip(ngx_fd_t fd, u_char *buf, size_t len,
+ngx_int_t level, ngx_log_t *log);
+static void *ngx_http_log_gzip_alloc(void *opaque, u_int items, u_int size);
+static void ngx_http_log_gzip_free(void *opaque, void *address);
+#endif
+static void ngx_http_log_flush(ngx_open_file_t *file, ngx_log_t *log);
+static void ngx_http_log_flush_handler(ngx_event_t *ev);
 static u_char *ngx_http_log_pipe(ngx_http_request_t *r, u_char *buf,
 ngx_http_log_op_t *op);
 static u_char *ngx_http_log_time(ngx_http_request_t *r, u_char *buf,
 ngx_http_log_op_t *op);
 0,
 NULL },
 { ngx_string("access_log"),
 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
-|NGX_HTTP_LMT_CONF|NGX_CONF_TAKE123,
+|NGX_HTTP_LMT_CONF|NGX_CONF_1MORE,
 ngx_http_log_set_log,
 NGX_HTTP_LOC_CONF_OFFSET,
 0,
 NULL },
 {
 u_char                   *line, *p;
 size_t                    len;
 ngx_uint_t                i, l;
 ngx_http_log_t           *log;
-ngx_open_file_t          *file;
 ngx_http_log_op_t        *op;
+ngx_http_log_buf_t       *buffer;
 ngx_http_log_loc_conf_t  *lcf;
 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
 "http log handler");
 }
 }
 len += NGX_LINEFEED_SIZE;
-file = log[l].file;
+buffer = log[l].file ? log[l].file->data : NULL;
-if (file && file->buffer) {
+if (buffer) {
-if (len > (size_t) (file->last - file->pos)) {
+if (len > (size_t) (buffer->last - buffer->pos)) {
-ngx_http_log_write(r, &log[l], file->buffer,
+ngx_http_log_write(r, &log[l], buffer->start,
-file->pos - file->buffer);
+buffer->pos - buffer->start);
-file->pos = file->buffer;
+buffer->pos = buffer->start;
 }
-if (len <= (size_t) (file->last - file->pos)) {
+if (len <= (size_t) (buffer->last - buffer->pos)) {
-p = file->pos;
+p = buffer->pos;
+if (buffer->event && p == buffer->start) {
+ngx_add_timer(buffer->event, buffer->flush);
+}
 for (i = 0; i < log[l].format->ops->nelts; i++) {
 p = op[i].run(r, p, &op[i]);
 }
 ngx_linefeed(p);
-file->pos = p;
+buffer->pos = p;
 continue;
+}
+if (buffer->event && buffer->event->timer_set) {
+ngx_del_timer(buffer->event);
 }
 }
 line = ngx_pnalloc(r->pool, len);
 if (line == NULL) {
 static void
 ngx_http_log_write(ngx_http_request_t *r, ngx_http_log_t *log, u_char *buf,
 size_t len)
 {
-u_char     *name;
+u_char              *name;
-time_t      now;
+time_t               now;
-ssize_t     n;
+ssize_t              n;
-ngx_err_t   err;
+ngx_err_t            err;
+#if (NGX_ZLIB)
+ngx_http_log_buf_t  *buffer;
+#endif
 if (log->script == NULL) {
 name = log->file->name.data;
+#if (NGX_ZLIB)
+buffer = log->file->data;
+if (buffer && buffer->gzip) {
+n = ngx_http_log_gzip(log->file->fd, buf, len, buffer->gzip,
+r->connection->log);
+} else {
+n = ngx_write_fd(log->file->fd, buf, len);
+}
+#else
 n = ngx_write_fd(log->file->fd, buf, len);
+#endif
 } else {
 name = NULL;
 n = ngx_http_log_script_write(r, log->script, &name, buf, len);
 }
 return n;
 }
+#if (NGX_ZLIB)
+static ssize_t
+ngx_http_log_gzip(ngx_fd_t fd, u_char *buf, size_t len, ngx_int_t level,
+ngx_log_t *log)
+{
+int          rc, wbits, memlevel;
+u_char      *out;
+size_t       size;
+ssize_t      n;
+z_stream     zstream;
+ngx_err_t    err;
+ngx_pool_t  *pool;
+wbits = MAX_WBITS;
+memlevel = MAX_MEM_LEVEL - 1;
+while ((ssize_t) len < ((1 << (wbits - 1)) - 262)) {
+wbits--;
+memlevel--;
+}
+/*
+* This is a formula from deflateBound() for conservative upper bound of
+* compressed data plus 18 bytes of gzip wrapper.
+*/
+size = len + ((len + 7) >> 3) + ((len + 63) >> 6) + 5 + 18;
+ngx_memzero(&zstream, sizeof(z_stream));
+pool = ngx_create_pool(256, log);
+if (pool == NULL) {
+/* simulate successful logging */
+return len;
+}
+pool->log = log;
+zstream.zalloc = ngx_http_log_gzip_alloc;
+zstream.zfree = ngx_http_log_gzip_free;
+zstream.opaque = pool;
+out = ngx_pnalloc(pool, size);
+if (out == NULL) {
+goto done;
+}
+zstream.next_in = buf;
+zstream.avail_in = len;
+zstream.next_out = out;
+zstream.avail_out = size;
+rc = deflateInit2(&zstream, (int) level, Z_DEFLATED, wbits + 16, memlevel,
+Z_DEFAULT_STRATEGY);
+if (rc != Z_OK) {
+ngx_log_error(NGX_LOG_ALERT, log, 0, "deflateInit2() failed: %d", rc);
+goto done;
+}
+ngx_log_debug4(NGX_LOG_DEBUG_HTTP, log, 0,
+"deflate in: ni:%p no:%p ai:%ud ao:%ud",
+zstream.next_in, zstream.next_out,
+zstream.avail_in, zstream.avail_out);
+rc = deflate(&zstream, Z_FINISH);
+if (rc != Z_STREAM_END) {
+ngx_log_error(NGX_LOG_ALERT, log, 0,
+"deflate(Z_FINISH) failed: %d", rc);
+goto done;
+}
+ngx_log_debug5(NGX_LOG_DEBUG_HTTP, log, 0,
+"deflate out: ni:%p no:%p ai:%ud ao:%ud rc:%d",
+zstream.next_in, zstream.next_out,
+zstream.avail_in, zstream.avail_out,
+rc);
+size -= zstream.avail_out;
+rc = deflateEnd(&zstream);
+if (rc != Z_OK) {
+ngx_log_error(NGX_LOG_ALERT, log, 0, "deflateEnd() failed: %d", rc);
+goto done;
+}
+n = ngx_write_fd(fd, out, size);
+if (n != (ssize_t) size) {
+err = (n == -1) ? ngx_errno : 0;
+ngx_destroy_pool(pool);
+ngx_set_errno(err);
+return -1;
+}
+done:
+ngx_destroy_pool(pool);
+/* simulate successful logging */
+return len;
+}
+static void *
+ngx_http_log_gzip_alloc(void *opaque, u_int items, u_int size)
+{
+ngx_pool_t *pool = opaque;
+ngx_log_debug2(NGX_LOG_DEBUG_HTTP, pool->log, 0,
+"gzip alloc: n:%ud s:%ud", items, size);
+return ngx_palloc(pool, items * size);
+}
+static void
+ngx_http_log_gzip_free(void *opaque, void *address)
+{
+#if 0
+ngx_pool_t *pool = opaque;
+ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pool->log, 0, "gzip free: %p", address);
+#endif
+}
+#endif
+static void
+ngx_http_log_flush(ngx_open_file_t *file, ngx_log_t *log)
+{
+size_t               len;
+ssize_t              n;
+ngx_http_log_buf_t  *buffer;
+buffer = file->data;
+len = buffer->pos - buffer->start;
+if (len == 0) {
+return;
+}
+#if (NGX_ZLIB)
+if (buffer->gzip) {
+n = ngx_http_log_gzip(file->fd, buffer->start, len, buffer->gzip, log);
+} else {
+n = ngx_write_fd(file->fd, buffer->start, len);
+}
+#else
+n = ngx_write_fd(file->fd, buffer->start, len);
+#endif
+if (n == -1) {
+ngx_log_error(NGX_LOG_ALERT, log, ngx_errno,
+ngx_write_fd_n " to \"%s\" failed",
+file->name.data);
+} else if ((size_t) n != len) {
+ngx_log_error(NGX_LOG_ALERT, log, 0,
+ngx_write_fd_n " to \"%s\" was incomplete: %z of %uz",
+file->name.data, n, len);
+}
+buffer->pos = buffer->start;
+if (buffer->event && buffer->event->timer_set) {
+ngx_del_timer(buffer->event);
+}
+}
+static void
+ngx_http_log_flush_handler(ngx_event_t *ev)
+{
+ngx_log_debug0(NGX_LOG_DEBUG_EVENT, ev->log, 0,
+"http log buffer flush handler");
+ngx_http_log_flush(ev->data, ev->log);
+}
 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;
 static char *
 ngx_http_log_set_log(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
 ngx_http_log_loc_conf_t *llcf = conf;
-ssize_t                     buf;
+ssize_t                     size;
+ngx_int_t                   gzip;
 ngx_uint_t                  i, n;
-ngx_str_t                  *value, name;
+ngx_msec_t                  flush;
+ngx_str_t                  *value, name, s;
 ngx_http_log_t             *log;
+ngx_http_log_buf_t         *buffer;
 ngx_http_log_fmt_t         *fmt;
 ngx_http_log_main_conf_t   *lmcf;
 ngx_http_script_compile_t   sc;
 value = cf->args->elts;
 for (i = 0; i < lmcf->formats.nelts; i++) {
 if (fmt[i].name.len == name.len
 && ngx_strcasecmp(fmt[i].name.data, name.data) == 0)
 {
 log->format = &fmt[i];
-goto buffer;
+break;
 }
 }
-ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+if (log->format == NULL) {
-"unknown log format \"%V\"", &name);
+ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-return NGX_CONF_ERROR;
+"unknown log format \"%V\"", &name);
+return NGX_CONF_ERROR;
-buffer:
+}
-if (cf->args->nelts == 4) {
+size = 0;
-if (ngx_strncmp(value[3].data, "buffer=", 7) != 0) {
+flush = 0;
+gzip = 0;
+for (i = 3; i < cf->args->nelts; i++) {
+if (ngx_strncmp(value[i].data, "buffer=", 7) == 0) {
+s.len = value[i].len - 7;
+s.data = value[i].data + 7;
+size = ngx_parse_size(&s);
+if (size == NGX_ERROR || size == 0) {
+ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+"invalid buffer size \"%V\"", &s);
+return NGX_CONF_ERROR;
+}
+continue;
+}
+if (ngx_strncmp(value[i].data, "flush=", 6) == 0) {
+s.len = value[i].len - 6;
+s.data = value[i].data + 6;
+flush = ngx_parse_time(&s, 0);
+if (flush == (ngx_msec_t) NGX_ERROR || flush == 0) {
+ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+"invalid flush time \"%V\"", &s);
+return NGX_CONF_ERROR;
+}
+continue;
+}
+if (ngx_strncmp(value[i].data, "gzip", 4) == 0
+&& (value[i].len == 4 || value[i].data[4] == '='))
+{
+#if (NGX_ZLIB)
+if (size == 0) {
+size = 64 * 1024;
+}
+if (value[i].len == 4) {
+gzip = Z_BEST_SPEED;
+continue;
+}
+s.len = value[i].len - 5;
+s.data = value[i].data + 5;
+gzip = ngx_atoi(s.data, s.len);
+if (gzip < 1 || gzip > 9) {
+ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+"invalid compression level \"%V\"", &s);
+return NGX_CONF_ERROR;
+}
+continue;
+#else
 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-"invalid parameter \"%V\"", &value[3]);
+"nginx was built without zlib support");
 return NGX_CONF_ERROR;
-}
+#endif
+}
+ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+"invalid parameter \"%V\"", &value[i]);
+return NGX_CONF_ERROR;
+}
+if (flush && size == 0) {
+ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+"no buffer is defined for access_log \"%V\"",
+&value[1]);
+return NGX_CONF_ERROR;
+}
+if (size) {
 if (log->script) {
 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
 "buffered logs cannot have variables in name");
 return NGX_CONF_ERROR;
 }
-name.len = value[3].len - 7;
+if (log->file->data) {
-name.data = value[3].data + 7;
+buffer = log->file->data;
-buf = ngx_parse_size(&name);
+if (buffer->last - buffer->start != size
+|| buffer->flush != flush
-if (buf == NGX_ERROR) {
+|| buffer->gzip != gzip)
-ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+{
-"invalid buffer value \"%V\"", &name);
+ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+"access_log \"%V\" already defined "
+"with conflicting parameters",
+&value[1]);
+return NGX_CONF_ERROR;
+}
+return NGX_CONF_OK;
+}
+buffer = ngx_pcalloc(cf->pool, sizeof(ngx_http_log_buf_t));
+if (buffer == NULL) {
 return NGX_CONF_ERROR;
 }
-if (log->file->buffer && log->file->last - log->file->pos != buf) {
+buffer->start = ngx_pnalloc(cf->pool, size);
-ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+if (buffer->start == NULL) {
-"access_log \"%V\" already defined "
-"with different buffer size", &value[1]);
 return NGX_CONF_ERROR;
 }
-log->file->buffer = ngx_palloc(cf->pool, buf);
+buffer->pos = buffer->start;
-if (log->file->buffer == NULL) {
+buffer->last = buffer->start + size;
-return NGX_CONF_ERROR;
-}
+if (flush) {
+buffer->event = ngx_pcalloc(cf->pool, sizeof(ngx_event_t));
-log->file->pos = log->file->buffer;
+if (buffer->event == NULL) {
-log->file->last = log->file->buffer + buf;
+return NGX_CONF_ERROR;
+}
+buffer->event->data = log->file;
+buffer->event->handler = ngx_http_log_flush_handler;
+buffer->event->log = &cf->cycle->new_log;
+buffer->flush = flush;
+}
+buffer->gzip = gzip;
+log->file->flush = ngx_http_log_flush;
+log->file->data = buffer;
 }
 return NGX_CONF_OK;
 }

Mercurial > hg > nginx-vendor-current

comparison src/http/modules/ngx_http_log_module.c @ 694:88a1b4797f2e NGINX_1_3_10