comparison src/http/ngx_http_request.c @ 484:ed5e10fb40fc NGINX_0_7_54

nginx 0.7.54 *) Feature: the ngx_http_image_filter_module. *) Feature: the "proxy_ignore_headers" and "fastcgi_ignore_headers" directives. *) Bugfix: a segmentation fault might occur in worker process, if an "open_file_cache_errors off" directive was used; the bug had appeared in 0.7.53. *) Bugfix: the "port_in_redirect off" directive did not work; the bug had appeared in 0.7.39. *) Bugfix: improve handling of "select" method errors. *) Bugfix: of "select() failed (10022: ...)" error in nginx/Windows. *) Bugfix: in error text descriptions in nginx/Windows; the bug had appeared in 0.7.53.
author Igor Sysoev <http://sysoev.ru>
date Fri, 01 May 2009 00:00:00 +0400
parents 392c16f2d858
children 829f9a66a659
comparison
equal deleted inserted replaced
483:0a2f4b42ddad 484:ed5e10fb40fc
418 } 418 }
419 419
420 #endif 420 #endif
421 421
422 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); 422 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
423 c->log->file = clcf->err_log->file; 423 c->log->file = clcf->error_log->file;
424 if (!(c->log->log_level & NGX_LOG_DEBUG_CONNECTION)) { 424 if (!(c->log->log_level & NGX_LOG_DEBUG_CONNECTION)) {
425 c->log->log_level = clcf->err_log->log_level; 425 c->log->log_level = clcf->error_log->log_level;
426 } 426 }
427 427
428 if (c->buffer == NULL) { 428 if (c->buffer == NULL) {
429 c->buffer = ngx_create_temp_buf(c->pool, 429 c->buffer = ngx_create_temp_buf(c->pool,
430 cscf->client_header_buffer_size); 430 cscf->client_header_buffer_size);
1702 1702
1703 r->srv_conf = cscf->ctx->srv_conf; 1703 r->srv_conf = cscf->ctx->srv_conf;
1704 r->loc_conf = cscf->ctx->loc_conf; 1704 r->loc_conf = cscf->ctx->loc_conf;
1705 1705
1706 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); 1706 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
1707 r->connection->log->file = clcf->err_log->file; 1707 r->connection->log->file = clcf->error_log->file;
1708 1708
1709 if (!(r->connection->log->log_level & NGX_LOG_DEBUG_CONNECTION)) { 1709 if (!(r->connection->log->log_level & NGX_LOG_DEBUG_CONNECTION)) {
1710 r->connection->log->log_level = clcf->err_log->log_level; 1710 r->connection->log->log_level = clcf->error_log->log_level;
1711 } 1711 }
1712 1712
1713 return NGX_OK; 1713 return NGX_OK;
1714 } 1714 }
1715 1715