diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2004-04-08 15:58:25 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2004-04-08 15:58:25 +0000 |
| commit | fff32326ca9009ebba0aadd24aa0683afe0d4a02 (patch) | |
| tree | ac738d570dd46b0ef6b15b09b42d9956245f5005 /src/http/ngx_http_core_module.c | |
| parent | 9a864bd8f87efd0fa23f552d4277475dd76bcea4 (diff) | |
| download | nginx-fff32326ca9009ebba0aadd24aa0683afe0d4a02.tar.gz nginx-fff32326ca9009ebba0aadd24aa0683afe0d4a02.zip | |
nginx-0.0.3-2004-04-08-19:58:25 import
Diffstat (limited to 'src/http/ngx_http_core_module.c')
| -rw-r--r-- | src/http/ngx_http_core_module.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c index 3ae61829f..6b0db2625 100644 --- a/src/http/ngx_http_core_module.c +++ b/src/http/ngx_http_core_module.c @@ -482,7 +482,9 @@ int ngx_http_find_location_config(ngx_http_request_t *r) r->loc_conf = clcfp[i]->loc_conf; clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); r->connection->log->file = clcf->err_log->file; - r->connection->log->log_level = clcf->err_log->log_level; + if (!(r->connection->log->log_level & NGX_LOG_DEBUG_CONNECTION)) { + r->connection->log->log_level = clcf->err_log->log_level; + } if (clcfp[i]->exact_match && r->uri.len == clcfp[i]->name.len) { #if (HAVE_PCRE) @@ -529,7 +531,9 @@ int ngx_http_find_location_config(ngx_http_request_t *r) r->loc_conf = clcfp[i]->loc_conf; clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); r->connection->log->file = clcf->err_log->file; - r->connection->log->log_level = clcf->err_log->log_level; + if (!(r->connection->log->log_level & NGX_LOG_DEBUG_CONNECTION)) { + r->connection->log->log_level = clcf->err_log->log_level; + } break; } |