comparison src/http/ngx_http_special_response.c @ 4241:6afb20bf2ad5 stable-1.0

Merging r4009, r4133, r4184, r4201, r4202, r4203, r4204, r4205: Miscellaneous fixes: *) Fix of names of the referer hash size directives introduced in r3940. *) Cosmetics: replaced NGX_CONF_TAKE1 to NGX_CONF_FLAG for "sendfile" and "chunked_transfer_encoding" directives, to be in line with all directives taking a boolean argument. Both flags will ensure that a directive takes one argument. *) Improved ngx_parse_time() code readability. *) Preallocating exact number of default MIME types entries. *) Stylistic change in checking the boolean expression. *) Replaced magic constants representing default values of some directives with appropriate #define's. *) Fixed grammar in a comment. *) Fixed two minor bugs in "types" parsing code.
author Igor Sysoev <igor@sysoev.ru>
date Tue, 01 Nov 2011 11:19:58 +0000
parents 39ad979cd31e
children b79dbadb3d5e
comparison
equal deleted inserted replaced
4240:17ab1927f80f 4241:6afb20bf2ad5
373 case NGX_HTTP_INTERNAL_SERVER_ERROR: 373 case NGX_HTTP_INTERNAL_SERVER_ERROR:
374 r->keepalive = 0; 374 r->keepalive = 0;
375 } 375 }
376 } 376 }
377 377
378 if (r->lingering_close == 1) { 378 if (r->lingering_close) {
379 switch (error) { 379 switch (error) {
380 case NGX_HTTP_BAD_REQUEST: 380 case NGX_HTTP_BAD_REQUEST:
381 case NGX_HTTP_TO_HTTPS: 381 case NGX_HTTP_TO_HTTPS:
382 case NGX_HTTPS_CERT_ERROR: 382 case NGX_HTTPS_CERT_ERROR:
383 case NGX_HTTPS_NO_CERT: 383 case NGX_HTTPS_NO_CERT: