Mercurial > hg > nginx-vendor-1-0
comparison src/http/modules/ngx_http_log_module.c @ 386:1172e6d6f40f NGINX_0_7_5
nginx 0.7.5
*) Bugfixes in variables support in the "access_log" directive; the bug
had appeared in 0.7.4.
*) Bugfix: nginx could not be built --without-http_gzip_module; the bug
had appeared in 0.7.3.
Thanks to Kirill A. Korinskiy.
*) Bugfix: if sub_filter and SSI were used together, then responses
might were transferred incorrectly.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Tue, 01 Jul 2008 00:00:00 +0400 |
parents | 12defd37f578 |
children | 6de24473fa70 |
comparison
equal
deleted
inserted
replaced
385:08118f73d9f2 | 386:1172e6d6f40f |
---|---|
420 if (ngx_open_cached_file(llcf->open_file_cache, &log, &of, r->pool) | 420 if (ngx_open_cached_file(llcf->open_file_cache, &log, &of, r->pool) |
421 != NGX_OK) | 421 != NGX_OK) |
422 { | 422 { |
423 ngx_log_error(NGX_LOG_CRIT, r->connection->log, ngx_errno, | 423 ngx_log_error(NGX_LOG_CRIT, r->connection->log, ngx_errno, |
424 ngx_open_file_n " \"%s\" failed", log.data); | 424 ngx_open_file_n " \"%s\" failed", log.data); |
425 return -1; | 425 /* simulate successfull logging */ |
426 return len; | |
426 } | 427 } |
427 | 428 |
428 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | 429 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
429 "http log #%d", of.fd); | 430 "http log #%d", of.fd); |
430 | 431 |
758 | 759 |
759 if (conf->logs || conf->off) { | 760 if (conf->logs || conf->off) { |
760 return NGX_CONF_OK; | 761 return NGX_CONF_OK; |
761 } | 762 } |
762 | 763 |
763 *conf = *prev; | 764 conf->logs = prev->logs; |
765 conf->off = prev->off; | |
764 | 766 |
765 if (conf->logs || conf->off) { | 767 if (conf->logs || conf->off) { |
766 return NGX_CONF_OK; | 768 return NGX_CONF_OK; |
767 } | 769 } |
768 | 770 |
779 log->file = ngx_conf_open_file(cf->cycle, &ngx_http_access_log); | 781 log->file = ngx_conf_open_file(cf->cycle, &ngx_http_access_log); |
780 if (log->file == NULL) { | 782 if (log->file == NULL) { |
781 return NGX_CONF_ERROR; | 783 return NGX_CONF_ERROR; |
782 } | 784 } |
783 | 785 |
786 log->script = NULL; | |
784 log->disk_full_time = 0; | 787 log->disk_full_time = 0; |
785 log->error_log_time = 0; | 788 log->error_log_time = 0; |
786 | 789 |
787 lmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_log_module); | 790 lmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_log_module); |
788 fmt = lmcf->formats.elts; | 791 fmt = lmcf->formats.elts; |