Mercurial > hg > nginx
annotate src/os/win32/nginx_icon16.xpm @ 4147:7f64de1cc2c0
Fix for double content when return is used in error_page handler.
Test case:
location / {
error_page 405 /nope;
return 405;
}
location /nope {
return 200;
}
This is expected to return 405 with empty body, but in 0.8.42+ will return
builtin 405 error page as well (though not counted in Content-Length, thus
breaking protocol).
Fix is to use status provided by rewrite script execution in case
it's less than NGX_HTTP_BAD_REQUEST even if r->error_status set. This
check is in line with one in ngx_http_script_return_code().
Note that this patch also changes behaviour for "return 302 ..." and
"rewrite ... redirect" used as error handler. E.g.
location / {
error_page 405 /redirect;
return 405;
}
location /redirect {
rewrite ^ http://example.com/;
}
will actually return redirect to "http://example.com/" instead of builtin 405
error page with meaningless Location header. This looks like correct change
and it's in line with what happens on e.g. directory redirects in error
handlers.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Tue, 27 Sep 2011 11:11:30 +0000 |
parents | 4ac89c5aa10d |
children |
rev | line source |
---|---|
681 | 1 /* XPM */ |
2 static char * nginx_xpm[] = { | |
3 "16 16 2 2", | |
4 /* colors */ | |
5 " c none", | |
6 "GG c #009900", | |
7 /* pixels */ | |
8 " ", | |
9 " GGGGGGGGGGGGGGGG ", | |
10 " GGGGGGGGGGGGGGGG ", | |
11 " GGGGGGGGGGGGGGGGGGGG ", | |
12 " GGGGGG GGGGGG ", | |
13 " GGGGGG GGGGGG ", | |
14 " GGGGGG ", | |
15 " GGGGGG GGGGGGGGGGGGGGGG ", | |
16 " GGGGGG GGGGGGGGGGGGGGGGGG ", | |
17 " GGGGGG GGGGGGGGGGGGGG ", | |
18 " GGGGGG GGGGGG ", | |
19 " GGGGGG GGGGGG ", | |
20 " GGGGGGGGGGGGGGGGGGGG ", | |
21 " GGGGGGGGGGGGGGGG ", | |
22 " GGGGGGGGGGGGGGGG ", | |
23 " " | |
754
4ac89c5aa10d
style fix: remove trailing spaces
Igor Sysoev <igor@sysoev.ru>
parents:
681
diff
changeset
|
24 }; |