Mercurial > hg > nginx
annotate src/core/ngx_murmurhash.c @ 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 | 203eb026ec07 |
children | f38647c651a8 |
rev | line source |
---|---|
3891 | 1 |
2 /* | |
3 * Copyright (C) Austin Appleby | |
4 */ | |
5 | |
6 | |
7 #include <ngx_config.h> | |
8 #include <ngx_core.h> | |
9 | |
10 | |
11 uint32_t | |
12 ngx_murmur_hash2(u_char *data, size_t len) | |
13 { | |
14 uint32_t h, k; | |
15 | |
16 h = 0 ^ len; | |
17 | |
18 while (len >= 4) { | |
19 k = data[0]; | |
20 k |= data[1] << 8; | |
21 k |= data[2] << 16; | |
22 k |= data[3] << 24; | |
23 | |
24 k *= 0x5bd1e995; | |
25 k ^= k >> 24; | |
26 k *= 0x5bd1e995; | |
27 | |
28 h *= 0x5bd1e995; | |
29 h ^= k; | |
30 | |
31 data += 4; | |
32 len -= 4; | |
33 } | |
34 | |
35 switch (len) { | |
36 case 3: | |
37 h ^= data[2] << 16; | |
38 case 2: | |
39 h ^= data[1] << 8; | |
40 case 1: | |
41 h ^= data[0]; | |
42 h *= 0x5bd1e995; | |
43 } | |
44 | |
45 h ^= h >> 13; | |
46 h *= 0x5bd1e995; | |
47 h ^= h >> 15; | |
48 | |
49 return h; | |
50 } |