Mercurial > hg > nginx-vendor-0-6
comparison src/http/ngx_http_special_response.c @ 382:e9979466be2f NGINX_0_6_35
nginx 0.6.35
*) Bugfix: in shared memory allocations if nginx was built without
debugging.
Thanks to Andrey Kvasov.
*) Bugfixes in an "Expect" request header line support.
*) Bugfix: UTF-8 encoding usage in the ngx_http_autoindex_module.
| author | Igor Sysoev <http://sysoev.ru> |
|---|---|
| date | Mon, 26 Jan 2009 00:00:00 +0300 |
| parents | fc497c1dfb7c |
| children |
comparison
equal
deleted
inserted
replaced
| 381:0d28fd57288c | 382:e9979466be2f |
|---|---|
| 376 return ngx_http_send_error_page(r, &err_page[i]); | 376 return ngx_http_send_error_page(r, &err_page[i]); |
| 377 } | 377 } |
| 378 } | 378 } |
| 379 } | 379 } |
| 380 | 380 |
| 381 r->expect_tested = 1; | |
| 382 | |
| 381 if (ngx_http_discard_request_body(r) != NGX_OK) { | 383 if (ngx_http_discard_request_body(r) != NGX_OK) { |
| 382 error = NGX_HTTP_INTERNAL_SERVER_ERROR; | 384 error = NGX_HTTP_INTERNAL_SERVER_ERROR; |
| 383 } | 385 } |
| 384 | 386 |
| 385 if (clcf->msie_refresh | 387 if (clcf->msie_refresh |
| 428 | 430 |
| 429 static ngx_int_t | 431 static ngx_int_t |
| 430 ngx_http_send_error_page(ngx_http_request_t *r, ngx_http_err_page_t *err_page) | 432 ngx_http_send_error_page(ngx_http_request_t *r, ngx_http_err_page_t *err_page) |
| 431 { | 433 { |
| 432 u_char ch, *p, *last; | 434 u_char ch, *p, *last; |
| 435 ngx_int_t overwrite; | |
| 433 ngx_str_t *uri, *args, u, a; | 436 ngx_str_t *uri, *args, u, a; |
| 434 ngx_table_elt_t *location; | 437 ngx_table_elt_t *location; |
| 435 ngx_http_core_loc_conf_t *clcf; | 438 ngx_http_core_loc_conf_t *clcf; |
| 436 | 439 |
| 437 r->err_status = err_page->overwrite; | 440 overwrite = err_page->overwrite; |
| 441 | |
| 442 if (overwrite && overwrite != NGX_HTTP_OK) { | |
| 443 r->expect_tested = 1; | |
| 444 } | |
| 445 | |
| 446 r->err_status = overwrite; | |
| 438 | 447 |
| 439 r->zero_in_uri = 0; | 448 r->zero_in_uri = 0; |
| 440 | 449 |
| 441 if (err_page->uri_lengths) { | 450 if (err_page->uri_lengths) { |
| 442 if (ngx_http_script_run(r, &u, err_page->uri_lengths->elts, 0, | 451 if (ngx_http_script_run(r, &u, err_page->uri_lengths->elts, 0, |