comparison src/http/ngx_http_core_module.c @ 192:af7f2341ecc5 NGINX_0_3_43

nginx 0.3.43 *) Bugfix: in the SSI.
author Igor Sysoev <http://sysoev.ru>
date Wed, 26 Apr 2006 00:00:00 +0400
parents 3689cd4e3228
children 003bd800ec2a
comparison
equal deleted inserted replaced
191:219b4d22ddd9 192:af7f2341ecc5
736 if (r->method & clcf->limit_except) { 736 if (r->method & clcf->limit_except) {
737 r->loc_conf = clcf->limit_except_loc_conf; 737 r->loc_conf = clcf->limit_except_loc_conf;
738 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); 738 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
739 } 739 }
740 740
741 r->connection->log->file = clcf->err_log->file; 741 if (r == r->main) {
742 if (!(r->connection->log->log_level & NGX_LOG_DEBUG_CONNECTION)) { 742 r->connection->log->file = clcf->err_log->file;
743 r->connection->log->log_level = clcf->err_log->log_level; 743 if (!(r->connection->log->log_level & NGX_LOG_DEBUG_CONNECTION)) {
744 r->connection->log->log_level = clcf->err_log->log_level;
745 }
744 } 746 }
745 747
746 if ((ngx_io.flags & NGX_IO_SENDFILE) && clcf->sendfile) { 748 if ((ngx_io.flags & NGX_IO_SENDFILE) && clcf->sendfile) {
747 r->connection->sendfile = 1; 749 r->connection->sendfile = 1;
748 750