comparison src/http/ngx_http_core_module.c @ 4513:2dfa4d76e4c5 stable-1.0

Merge of r4491, r4492: *) Renamed constants and fixed off-by-one error in "msie_padding on" handling. *) Added support for the 307 Temporary Redirect.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 05 Mar 2012 13:03:39 +0000
parents 83c26de984ef
children
comparison
equal deleted inserted replaced
4512:cbed47593ce0 4513:2dfa4d76e4c5
1796 1796
1797 if (ngx_http_complex_value(r, cv, &val) != NGX_OK) { 1797 if (ngx_http_complex_value(r, cv, &val) != NGX_OK) {
1798 return NGX_HTTP_INTERNAL_SERVER_ERROR; 1798 return NGX_HTTP_INTERNAL_SERVER_ERROR;
1799 } 1799 }
1800 1800
1801 if (status >= NGX_HTTP_MOVED_PERMANENTLY && status <= NGX_HTTP_SEE_OTHER) { 1801 if (status == NGX_HTTP_MOVED_PERMANENTLY
1802 1802 || status == NGX_HTTP_MOVED_TEMPORARILY
1803 || status == NGX_HTTP_SEE_OTHER
1804 || status == NGX_HTTP_TEMPORARY_REDIRECT)
1805 {
1803 ngx_http_clear_location(r); 1806 ngx_http_clear_location(r);
1804 1807
1805 r->headers_out.location = ngx_list_push(&r->headers_out.headers); 1808 r->headers_out.location = ngx_list_push(&r->headers_out.headers);
1806 if (r->headers_out.location == NULL) { 1809 if (r->headers_out.location == NULL) {
1807 return NGX_HTTP_INTERNAL_SERVER_ERROR; 1810 return NGX_HTTP_INTERNAL_SERVER_ERROR;