Mercurial > hg > nginx
annotate src/os/win32/nginx_icon32.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 | 7e24168b0853 |
children |
rev | line source |
---|---|
681 | 1 /* XPM */ |
2 static char * nginx_xpm[] = { | |
3 "32 32 2 2", | |
4 /* colors */ | |
5 " c none", | |
6 "GG c #009900", | |
7 /* pixels */ | |
8 " ", | |
9 " ", | |
10 " ", | |
11 " ", | |
12 " GGGGGGGGGGGGGGGGGGGGGGGGGGGG ", | |
13 " GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG ", | |
14 " GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG ", | |
15 " GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG ", | |
16 " GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG ", | |
17 " GGGGGGGGGG GGGGGGGGGG ", | |
18 " GGGGGGGGGG GGGGGGGGGG ", | |
19 " GGGGGGGGGG GGGGGGGGGG ", | |
20 " GGGGGGGGGG GGGGGGGGGG ", | |
21 " GGGGGGGGGG ", | |
22 " GGGGGGGGGG ", | |
23 " GGGGGGGGGG GGGGGGGGGGGGGGGGGGGGGGGGGGGGGG ", | |
24 " GGGGGGGGGG GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG ", | |
25 " GGGGGGGGGG GGGGGGGGGGGGGGGGGGGGGGGGGGGGGG ", | |
26 " GGGGGGGGGG GGGGGGGGGGGGGGGGGGGGGGGGGGGGGG ", | |
27 " GGGGGGGGGG GGGGGGGGGGGGGGGGGGGGGGGGGG ", | |
28 " GGGGGGGGGG GGGGGGGGGG ", | |
29 " GGGGGGGGGG GGGGGGGGGG ", | |
30 " GGGGGGGGGG GGGGGGGGGG ", | |
31 " GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG ", | |
32 " GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG ", | |
33 " GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG ", | |
34 " GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG ", | |
35 " GGGGGGGGGGGGGGGGGGGGGGGGGGGG ", | |
36 " ", | |
37 " ", | |
38 " ", | |
39 " " |