Mercurial > hg > nginx
annotate auto/lib/zlib/makefile.bcc @ 7355:b64adc956643
Rewrite: removed r->err_status special handling (ticket #1634).
Trying to look into r->err_status in the "return" directive
makes it behave differently than real errors generated in other
parts of the code, and is an endless source of various problems.
This behaviour was introduced in 726:7b71936d5299 (0.4.4) with
the comment "fix: "return" always overrode "error_page" response code".
It is not clear if there were any real cases this was expected to fix,
but there are several cases which are broken due to this change, some
previously fixed (4147:7f64de1cc2c0).
In ticket #1634, the problem is that when r->err_status is set to
a non-special status code, it is not possible to return a response
by simply returning r->err_status. If this is the case, the only
option is to return script's e->status instead. An example
configuration:
location / {
error_page 404 =200 /err502;
return 404;
}
location = /err502 {
return 502;
}
After the change, such a configuration will properly return
standard 502 error, much like it happens when a 502 error is
generated by proxy_pass.
This also fixes the following configuration to properly close
connection as clearly requested by "return 444":
location / {
error_page 404 /close;
return 404;
}
location = /close {
return 444;
}
Previously, this required "error_page 404 = /close;" to work
as intended.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Fri, 21 Sep 2018 15:59:33 +0300 |
parents | 9d458803bbe0 |
children |
rev | line source |
---|---|
444
42d11f017717
nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents:
297
diff
changeset
|
1 |
42d11f017717
nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents:
297
diff
changeset
|
2 # Copyright (C) Igor Sysoev |
4412 | 3 # Copyright (C) Nginx, Inc. |
444
42d11f017717
nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents:
297
diff
changeset
|
4 |
297
ee394e997c77
nginx-0.0.3-2004-03-29-21:43:58 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
5 |
593 | 6 CFLAGS = -q -O2 -tWM -w-8004 -w-8012 $(CPU_OPT) |
297
ee394e997c77
nginx-0.0.3-2004-03-29-21:43:58 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
7 |
ee394e997c77
nginx-0.0.3-2004-03-29-21:43:58 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
8 zlib.lib: |
2838
ecdc41bf2047
backout r2833: CURDIR was set to Unix style path
Igor Sysoev <igor@sysoev.ru>
parents:
593
diff
changeset
|
9 cd $(ZLIB) |
ecdc41bf2047
backout r2833: CURDIR was set to Unix style path
Igor Sysoev <igor@sysoev.ru>
parents:
593
diff
changeset
|
10 |
4839
9d458803bbe0
Configure: provide inflate() when building zlib on win32.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
11 bcc32 -c $(CFLAGS) adler32.c crc32.c deflate.c \ |
9d458803bbe0
Configure: provide inflate() when building zlib on win32.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
12 trees.c zutil.c compress.c \ |
9d458803bbe0
Configure: provide inflate() when building zlib on win32.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
13 inflate.c inffast.c inftrees.c |
297
ee394e997c77
nginx-0.0.3-2004-03-29-21:43:58 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
14 |
ee394e997c77
nginx-0.0.3-2004-03-29-21:43:58 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
15 tlib zlib.lib +adler32.obj +crc32.obj +deflate.obj \ |
4839
9d458803bbe0
Configure: provide inflate() when building zlib on win32.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
16 +trees.obj +zutil.obj +compress.obj \ |
9d458803bbe0
Configure: provide inflate() when building zlib on win32.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
17 +inflate.obj +inffast.obj +inftrees.obj |