view auto/lib/md5/makefile.bcc @ 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
line wrap: on
line source


# Copyright (C) Igor Sysoev
# Copyright (C) Nginx, Inc.


CFLAGS = -q -O2 -tWM $(CPU_OPT) -DL_ENDIAN

!if "$(MD5_ASM)" == "YES"

md5.lib:
	cd $(MD5)
	bcc32 -c $(CFLAGS) -DMD5_ASM md5_dgst.c
	tlib md5.lib +md5_dgst.obj +"asm\m-win32.obj"

!else

md5.lib:
	cd $(MD5)
	bcc32 -c $(CFLAGS) md5_dgst.c
	tlib md5.lib +md5_dgst.obj

!endif