Mercurial > hg > nginx
annotate src/core/ngx_sha1.h @ 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 | 27d4ed42e49d |
children | d620f497c50f |
rev | line source |
---|---|
1573 | 1 |
2 /* | |
3 * Copyright (C) Igor Sysoev | |
4 */ | |
5 | |
6 | |
7 #ifndef _NGX_SHA1_H_INCLUDED_ | |
8 #define _NGX_SHA1_H_INCLUDED_ | |
9 | |
10 | |
11 #include <ngx_config.h> | |
12 #include <ngx_core.h> | |
13 | |
14 | |
15 #if (NGX_HAVE_OPENSSL_SHA1_H) | |
16 #include <openssl/sha.h> | |
17 #else | |
18 #include <sha.h> | |
19 #endif | |
20 | |
21 | |
22 typedef SHA_CTX ngx_sha1_t; | |
23 | |
24 | |
1598 | 25 #define ngx_sha1_init SHA1_Init |
26 #define ngx_sha1_update SHA1_Update | |
27 #define ngx_sha1_final SHA1_Final | |
1573 | 28 |
29 | |
30 #endif /* _NGX_SHA1_H_INCLUDED_ */ |