mirror
/
nginx
mirror of https://github.com/nginx/nginx
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge of r4491, r4492: 

*) Renamed constants and fixed off-by-one error in "msie_padding on"
   handling.

*) Added support for the 307 Temporary Redirect.
This commit is contained in:
Maxim Dounin 2012-03-05 13:03:39 +00:00
parent 01f5961540
commit 031458770a
6 changed files with 48 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/http/modules/ngx_http_headers_filter_module.c
View File

@ -149,7 +149,9 @@ ngx_http_headers_filter(ngx_http_request_t *r)
&& r->headers_out.status != NGX_HTTP_PARTIAL_CONTENT && r->headers_out.status != NGX_HTTP_PARTIAL_CONTENT
&& r->headers_out.status != NGX_HTTP_MOVED_PERMANENTLY && r->headers_out.status != NGX_HTTP_MOVED_PERMANENTLY
&& r->headers_out.status != NGX_HTTP_MOVED_TEMPORARILY && r->headers_out.status != NGX_HTTP_MOVED_TEMPORARILY
&& r->headers_out.status != NGX_HTTP_NOT_MODIFIED)) && r->headers_out.status != NGX_HTTP_SEE_OTHER
&& r->headers_out.status != NGX_HTTP_NOT_MODIFIED
&& r->headers_out.status != NGX_HTTP_TEMPORARY_REDIRECT))
{ {
return ngx_http_next_header_filter(r); return ngx_http_next_header_filter(r);
} }

4
src/http/modules/perl/nginx.pm
View File

@ -21,7 +21,9 @@ our @EXPORT = qw(
HTTP_MOVED_PERMANENTLY HTTP_MOVED_PERMANENTLY
HTTP_MOVED_TEMPORARILY HTTP_MOVED_TEMPORARILY
HTTP_REDIRECT HTTP_REDIRECT
HTTP_SEE_OTHER
HTTP_NOT_MODIFIED HTTP_NOT_MODIFIED
HTTP_TEMPORARY_REDIRECT
HTTP_BAD_REQUEST HTTP_BAD_REQUEST
HTTP_UNAUTHORIZED HTTP_UNAUTHORIZED
@ -67,7 +69,9 @@ use constant HTTP_PARTIAL_CONTENT => 206;
use constant HTTP_MOVED_PERMANENTLY => 301; use constant HTTP_MOVED_PERMANENTLY => 301;
use constant HTTP_MOVED_TEMPORARILY => 302; use constant HTTP_MOVED_TEMPORARILY => 302;
use constant HTTP_REDIRECT => 302; use constant HTTP_REDIRECT => 302;
use constant HTTP_SEE_OTHER => 303;
use constant HTTP_NOT_MODIFIED => 304; use constant HTTP_NOT_MODIFIED => 304;
use constant HTTP_TEMPORARY_REDIRECT => 307;
use constant HTTP_BAD_REQUEST => 400; use constant HTTP_BAD_REQUEST => 400;
use constant HTTP_UNAUTHORIZED => 401; use constant HTTP_UNAUTHORIZED => 401;

7
src/http/ngx_http_core_module.c
View File

@ -1798,8 +1798,11 @@ ngx_http_send_response(ngx_http_request_t *r, ngx_uint_t status,
return NGX_HTTP_INTERNAL_SERVER_ERROR; return NGX_HTTP_INTERNAL_SERVER_ERROR;
} }
if (status >= NGX_HTTP_MOVED_PERMANENTLY && status <= NGX_HTTP_SEE_OTHER) { if (status == NGX_HTTP_MOVED_PERMANENTLY
|| status == NGX_HTTP_MOVED_TEMPORARILY
|| status == NGX_HTTP_SEE_OTHER
|| status == NGX_HTTP_TEMPORARY_REDIRECT)
{
ngx_http_clear_location(r); ngx_http_clear_location(r);
r->headers_out.location = ngx_list_push(&r->headers_out.headers); r->headers_out.location = ngx_list_push(&r->headers_out.headers);

9
src/http/ngx_http_header_filter_module.c
View File

@ -71,12 +71,11 @@ static ngx_str_t ngx_http_status_lines[] = {
ngx_string("302 Moved Temporarily"), ngx_string("302 Moved Temporarily"),
ngx_string("303 See Other"), ngx_string("303 See Other"),
ngx_string("304 Not Modified"), ngx_string("304 Not Modified"),
ngx_null_string, /* "305 Use Proxy" */
ngx_null_string, /* "306 unused" */
ngx_string("307 Temporary Redirect"),
/* ngx_null_string, */ /* "305 Use Proxy" */ #define NGX_HTTP_LAST_3XX 308
/* ngx_null_string, */ /* "306 unused" */
/* ngx_null_string, */ /* "307 Temporary Redirect" */
#define NGX_HTTP_LAST_3XX 305
#define NGX_HTTP_OFF_4XX (NGX_HTTP_LAST_3XX - 301 + NGX_HTTP_OFF_3XX) #define NGX_HTTP_OFF_4XX (NGX_HTTP_LAST_3XX - 301 + NGX_HTTP_OFF_3XX)
ngx_string("400 Bad Request"), ngx_string("400 Bad Request"),

1
src/http/ngx_http_request.h
View File

@ -75,6 +75,7 @@
#define NGX_HTTP_MOVED_TEMPORARILY 302 #define NGX_HTTP_MOVED_TEMPORARILY 302
#define NGX_HTTP_SEE_OTHER 303 #define NGX_HTTP_SEE_OTHER 303
#define NGX_HTTP_NOT_MODIFIED 304 #define NGX_HTTP_NOT_MODIFIED 304
#define NGX_HTTP_TEMPORARY_REDIRECT 307
#define NGX_HTTP_BAD_REQUEST 400 #define NGX_HTTP_BAD_REQUEST 400
#define NGX_HTTP_UNAUTHORIZED 401 #define NGX_HTTP_UNAUTHORIZED 401

54
src/http/ngx_http_special_response.c
View File

@ -74,6 +74,14 @@ static char ngx_http_error_303_page[] =
; ;
static char ngx_http_error_307_page[] =
"<html>" CRLF
"<head><title>307 Temporary Redirect</title></head>" CRLF
"<body bgcolor=\"white\">" CRLF
"<center><h1>307 Temporary Redirect</h1></center>" CRLF
;
static char ngx_http_error_400_page[] = static char ngx_http_error_400_page[] =
"<html>" CRLF "<html>" CRLF
"<head><title>400 Bad Request</title></head>" CRLF "<head><title>400 Bad Request</title></head>" CRLF
@ -294,16 +302,20 @@ static ngx_str_t ngx_http_error_pages[] = {
ngx_null_string, /* 201, 204 */ ngx_null_string, /* 201, 204 */
#define NGX_HTTP_LAST_LEVEL_200 202 #define NGX_HTTP_LAST_2XX 202
#define NGX_HTTP_LEVEL_200 (NGX_HTTP_LAST_LEVEL_200 - 201) #define NGX_HTTP_OFF_3XX (NGX_HTTP_LAST_2XX - 201)
/* ngx_null_string, */ /* 300 */ /* ngx_null_string, */ /* 300 */
ngx_string(ngx_http_error_301_page), ngx_string(ngx_http_error_301_page),
ngx_string(ngx_http_error_302_page), ngx_string(ngx_http_error_302_page),
ngx_string(ngx_http_error_303_page), ngx_string(ngx_http_error_303_page),
ngx_null_string, /* 304 */
ngx_null_string, /* 305 */
ngx_null_string, /* 306 */
ngx_string(ngx_http_error_307_page),
#define NGX_HTTP_LAST_LEVEL_300 304 #define NGX_HTTP_LAST_3XX 308
#define NGX_HTTP_LEVEL_300 (NGX_HTTP_LAST_LEVEL_300 - 301) #define NGX_HTTP_OFF_4XX (NGX_HTTP_LAST_3XX - 301 + NGX_HTTP_OFF_3XX)
ngx_string(ngx_http_error_400_page), ngx_string(ngx_http_error_400_page),
ngx_string(ngx_http_error_401_page), ngx_string(ngx_http_error_401_page),
@ -323,8 +335,8 @@ static ngx_str_t ngx_http_error_pages[] = {
ngx_string(ngx_http_error_415_page), ngx_string(ngx_http_error_415_page),
ngx_string(ngx_http_error_416_page), ngx_string(ngx_http_error_416_page),
#define NGX_HTTP_LAST_LEVEL_400 417 #define NGX_HTTP_LAST_4XX 417
#define NGX_HTTP_LEVEL_400 (NGX_HTTP_LAST_LEVEL_400 - 400) #define NGX_HTTP_OFF_5XX (NGX_HTTP_LAST_4XX - 400 + NGX_HTTP_OFF_4XX)
ngx_string(ngx_http_error_494_page), /* 494, request header too large */ ngx_string(ngx_http_error_494_page), /* 494, request header too large */
ngx_string(ngx_http_error_495_page), /* 495, https certificate error */ ngx_string(ngx_http_error_495_page), /* 495, https certificate error */
@ -342,7 +354,7 @@ static ngx_str_t ngx_http_error_pages[] = {
ngx_null_string, /* 506 */ ngx_null_string, /* 506 */
ngx_string(ngx_http_error_507_page) ngx_string(ngx_http_error_507_page)
#define NGX_HTTP_LAST_LEVEL_500 508 #define NGX_HTTP_LAST_5XX 508
}; };
@ -428,25 +440,22 @@ ngx_http_special_response_handler(ngx_http_request_t *r, ngx_int_t error)
err = 0; err = 0;
} else if (error >= NGX_HTTP_MOVED_PERMANENTLY } else if (error >= NGX_HTTP_MOVED_PERMANENTLY
&& error < NGX_HTTP_LAST_LEVEL_300) && error < NGX_HTTP_LAST_3XX)
{ {
/* 3XX */ /* 3XX */
err = error - NGX_HTTP_MOVED_PERMANENTLY + NGX_HTTP_LEVEL_200; err = error - NGX_HTTP_MOVED_PERMANENTLY + NGX_HTTP_OFF_3XX;
} else if (error >= NGX_HTTP_BAD_REQUEST } else if (error >= NGX_HTTP_BAD_REQUEST
&& error < NGX_HTTP_LAST_LEVEL_400) && error < NGX_HTTP_LAST_4XX)
{ {
/* 4XX */ /* 4XX */
err = error - NGX_HTTP_BAD_REQUEST + NGX_HTTP_LEVEL_200 err = error - NGX_HTTP_BAD_REQUEST + NGX_HTTP_OFF_4XX;
+ NGX_HTTP_LEVEL_300;
} else if (error >= NGX_HTTP_NGINX_CODES } else if (error >= NGX_HTTP_NGINX_CODES
&& error < NGX_HTTP_LAST_LEVEL_500) && error < NGX_HTTP_LAST_5XX)
{ {
/* 49X, 5XX */ /* 49X, 5XX */
err = error - NGX_HTTP_NGINX_CODES + NGX_HTTP_LEVEL_200 err = error - NGX_HTTP_NGINX_CODES + NGX_HTTP_OFF_5XX;
+ NGX_HTTP_LEVEL_300
+ NGX_HTTP_LEVEL_400;
switch (error) { switch (error) {
case NGX_HTTP_TO_HTTPS: case NGX_HTTP_TO_HTTPS:
case NGX_HTTPS_CERT_ERROR: case NGX_HTTPS_CERT_ERROR:
@ -570,12 +579,11 @@ ngx_http_send_error_page(ngx_http_request_t *r, ngx_http_err_page_t *err_page)
return NGX_ERROR; return NGX_ERROR;
} }
if (overwrite >= NGX_HTTP_MOVED_PERMANENTLY if (overwrite != NGX_HTTP_MOVED_PERMANENTLY
&& overwrite <= NGX_HTTP_SEE_OTHER) && overwrite != NGX_HTTP_MOVED_TEMPORARILY
&& overwrite != NGX_HTTP_SEE_OTHER
&& overwrite != NGX_HTTP_TEMPORARY_REDIRECT)
{ {
r->err_status = overwrite;
} else {
r->err_status = NGX_HTTP_MOVED_TEMPORARILY; r->err_status = NGX_HTTP_MOVED_TEMPORARILY;
} }
@ -595,7 +603,7 @@ ngx_http_send_error_page(ngx_http_request_t *r, ngx_http_err_page_t *err_page)
return ngx_http_send_special_response(r, clcf, r->err_status return ngx_http_send_special_response(r, clcf, r->err_status
- NGX_HTTP_MOVED_PERMANENTLY - NGX_HTTP_MOVED_PERMANENTLY
+ NGX_HTTP_LEVEL_200); + NGX_HTTP_OFF_3XX);
} }
@ -626,7 +634,7 @@ ngx_http_send_special_response(ngx_http_request_t *r,
if (clcf->msie_padding if (clcf->msie_padding
&& (r->headers_in.msie || r->headers_in.chrome) && (r->headers_in.msie || r->headers_in.chrome)
&& r->http_version >= NGX_HTTP_VERSION_10 && r->http_version >= NGX_HTTP_VERSION_10
&& err >= NGX_HTTP_LEVEL_300) && err >= NGX_HTTP_OFF_4XX)
{ {
r->headers_out.content_length_n += r->headers_out.content_length_n +=
sizeof(ngx_http_msie_padding) - 1; sizeof(ngx_http_msie_padding) - 1;