Mercurial > hg > nginx

comparison src/http/ngx_http_request.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 7f1cbcc71327
children 66e0f9adbc8c
comparison
equal deleted inserted replaced
5085:7f1cbcc71327 5086:1b204b8ea9a3
441 } 441 }
442 442
443 #endif 443 #endif
444 444
445 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); 445 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
446 c->log->file = clcf->error_log->file; 446
447 if (!(c->log->log_level & NGX_LOG_DEBUG_CONNECTION)) { 447 ngx_http_set_connection_log(r->connection, clcf->error_log);
448 c->log->log_level = clcf->error_log->log_level;
449 }
450 448
451 if (c->buffer == NULL) { 449 if (c->buffer == NULL) {
452 c->buffer = ngx_create_temp_buf(c->pool, 450 c->buffer = ngx_create_temp_buf(c->pool,
453 cscf->client_header_buffer_size); 451 cscf->client_header_buffer_size);
454 if (c->buffer == NULL) { 452 if (c->buffer == NULL) {
1850 1848
1851 r->srv_conf = cscf->ctx->srv_conf; 1849 r->srv_conf = cscf->ctx->srv_conf;
1852 r->loc_conf = cscf->ctx->loc_conf; 1850 r->loc_conf = cscf->ctx->loc_conf;
1853 1851
1854 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); 1852 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
1855 r->connection->log->file = clcf->error_log->file; 1853
1856 1854 ngx_http_set_connection_log(r->connection, clcf->error_log);
1857 if (!(r->connection->log->log_level & NGX_LOG_DEBUG_CONNECTION)) {
1858 r->connection->log->log_level = clcf->error_log->log_level;
1859 }
1860 1855
1861 return NGX_OK; 1856 return NGX_OK;
1862 } 1857 }
1863 1858
1864 1859