Mercurial > hg > nginx
annotate auto/lib/md5/makefile.msvc @ 5052:f2dcb25987df stable-1.2
Merge of r4979, r4982: image filter configuration inheritance.
*) Image filter: configuration inheritance fixes.
The image_filter_jpeg_quality, image_filter_sharpen and
"image_filter rotate" were inherited incorrectly if a directive
with variables was defined, and then redefined to a literal value,
i.e. in configurations like
image_filter_jpeg_quality $arg_q;
location / {
image_filter_jpeg_quality 50;
}
Patch by Ian Babrou, with minor changes.
*) Image filter: fixed image_filter rotate inheritance.
Configurations like
location /i/ {
image_filter resize 200 200;
image_filter rotate 180;
location /i/foo/ {
image_filter resize 200 200;
}
}
resulted in rotation incorrectly applied in the location /i/foo,
without any way to clear it. Fix is to handle conf->angle/conf->acv
consistently with other filter variables and do not try to inherit
them if there are transformations defined for current location.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Mon, 11 Feb 2013 13:59:08 +0000 |
parents | d620f497c50f |
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 |
195
8dee38ea9117
nginx-0.0.1-2003-11-25-23:44:56 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
5 |
653 | 6 CFLAGS = -nologo -O2 -Ob1 -Oi -Gs $(LIBC) $(CPU_OPT) -D L_ENDIAN |
284
1fecc9478d92
nginx-0.0.2-2004-03-10-23:56:39 import
Igor Sysoev <igor@sysoev.ru>
parents:
283
diff
changeset
|
7 |
675 | 8 !IF "$(MD5_ASM)" == "YES" |
284
1fecc9478d92
nginx-0.0.2-2004-03-10-23:56:39 import
Igor Sysoev <igor@sysoev.ru>
parents:
283
diff
changeset
|
9 |
1fecc9478d92
nginx-0.0.2-2004-03-10-23:56:39 import
Igor Sysoev <igor@sysoev.ru>
parents:
283
diff
changeset
|
10 md5.lib: |
2838
ecdc41bf2047
backout r2833: CURDIR was set to Unix style path
Igor Sysoev <igor@sysoev.ru>
parents:
675
diff
changeset
|
11 cd $(MD5) |
297
ee394e997c77
nginx-0.0.3-2004-03-29-21:43:58 import
Igor Sysoev <igor@sysoev.ru>
parents:
286
diff
changeset
|
12 cl -c $(CFLAGS) -D MD5_ASM md5_dgst.c |
284
1fecc9478d92
nginx-0.0.2-2004-03-10-23:56:39 import
Igor Sysoev <igor@sysoev.ru>
parents:
283
diff
changeset
|
13 link -lib -out:md5.lib md5_dgst.obj asm/m-win32.obj |
1fecc9478d92
nginx-0.0.2-2004-03-10-23:56:39 import
Igor Sysoev <igor@sysoev.ru>
parents:
283
diff
changeset
|
14 |
675 | 15 !ELSE |
281
014292b55158
nginx-0.0.2-2004-03-05-19:37:51 import
Igor Sysoev <igor@sysoev.ru>
parents:
216
diff
changeset
|
16 |
282
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
281
diff
changeset
|
17 md5.lib: |
2838
ecdc41bf2047
backout r2833: CURDIR was set to Unix style path
Igor Sysoev <igor@sysoev.ru>
parents:
675
diff
changeset
|
18 cd $(MD5) |
297
ee394e997c77
nginx-0.0.3-2004-03-29-21:43:58 import
Igor Sysoev <igor@sysoev.ru>
parents:
286
diff
changeset
|
19 cl -c $(CFLAGS) md5_dgst.c |
284
1fecc9478d92
nginx-0.0.2-2004-03-10-23:56:39 import
Igor Sysoev <igor@sysoev.ru>
parents:
283
diff
changeset
|
20 link -lib -out:md5.lib md5_dgst.obj |
1fecc9478d92
nginx-0.0.2-2004-03-10-23:56:39 import
Igor Sysoev <igor@sysoev.ru>
parents:
283
diff
changeset
|
21 |
675 | 22 !ENDIF |