Mercurial > hg > nginx

comparison src/http/ngx_http_core_module.c @ 5086:1b204b8ea9a3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Introduced the ngx_http_set_connection_log() macro. No functional changes.
author Valentin Bartenev <vbart@nginx.com>
date Wed, 27 Feb 2013 16:56:47 +0000
parents f7fe817c92a2
children c0f7b94e88ba
comparison
equal deleted inserted replaced
5085:7f1cbcc71327 5086:1b204b8ea9a3
1459 r->loc_conf = clcf->limit_except_loc_conf; 1459 r->loc_conf = clcf->limit_except_loc_conf;
1460 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); 1460 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
1461 } 1461 }
1462 1462
1463 if (r == r->main) { 1463 if (r == r->main) {
1464 r->connection->log->file = clcf->error_log->file; 1464 ngx_http_set_connection_log(r->connection, clcf->error_log);
1465
1466 if (!(r->connection->log->log_level & NGX_LOG_DEBUG_CONNECTION)) {
1467 r->connection->log->log_level = clcf->error_log->log_level;
1468 }
1469 } 1465 }
1470 1466
1471 if ((ngx_io.flags & NGX_IO_SENDFILE) && clcf->sendfile) { 1467 if ((ngx_io.flags & NGX_IO_SENDFILE) && clcf->sendfile) {
1472 r->connection->sendfile = 1; 1468 r->connection->sendfile = 1;
1473 1469