# HG changeset patch
# User Piotr Sikora <piotr@cloudflare.com>
# Date 1401818028 25200
# Tue Jun 03 10:53:48 2014 -0700
# Node ID 7f425d67f91ae3966b4f31b33dcd0386977a97a4
# Parent c46657e391a3710c4ea20f312d46ff6566d80aef
Access log: fix default value, broken by cb308813b453.

log->filter ("if" parameter) was uninitialized when the default value
was being used, which would lead to a crash (SIGSEGV) when access_log
directive wasn't specified in the configuration.

Zero-fill the whole structure instead of zeroing fields one-by-one
in order to prevent similar issues in the future.

Signed-off-by: Piotr Sikora <piotr@cloudflare.com>

diff -r c46657e391a3 -r 7f425d67f91a src/http/modules/ngx_http_log_module.c
--- a/src/http/modules/ngx_http_log_module.c Tue Jun 03 17:53:03 2014 +0400
+++ b/src/http/modules/ngx_http_log_module.c Tue Jun 03 10:53:48 2014 -0700
@@ -1109,16 +1109,13 @@ ngx_http_log_merge_loc_conf(ngx_conf_t *
return NGX_CONF_ERROR;
}

+ ngx_memzero(log, sizeof(ngx_http_log_t));
+
log->file = ngx_conf_open_file(cf->cycle, &ngx_http_access_log);
if (log->file == NULL) {
return NGX_CONF_ERROR;
}

- log->script = NULL;
- log->disk_full_time = 0;
- log->error_log_time = 0;
- log->syslog_peer = NULL;
-
lmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_log_module);
fmt = lmcf->formats.elts;


_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel