Mercurial > hg > nginx

view auto/lib/perl/make @ 5052:f2dcb25987df stable-1.2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 1559423ec28b
children 3099747ddbb5
line wrap: on
line source


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


cat << END                                                    >> $NGX_MAKEFILE

$NGX_OBJS/src/http/modules/perl/blib/arch/auto/nginx/nginx.so:		\
		src/http/modules/perl/nginx.pm				\
		src/http/modules/perl/nginx.xs				\
		src/http/modules/perl/ngx_http_perl_module.h		\
		$NGX_OBJS/src/http/modules/perl/Makefile
	cp -p src/http/modules/perl/nginx.* $NGX_OBJS/src/http/modules/perl/

	cd $NGX_OBJS/src/http/modules/perl && \$(MAKE)

	rm -rf $NGX_OBJS/install_perl


$NGX_OBJS/src/http/modules/perl/Makefile:				\
		src/http/modules/perl/Makefile.PL			\
		src/http/modules/perl/nginx.pm
	cp -p src/http/modules/perl/nginx.* $NGX_OBJS/src/http/modules/perl/
	cp -p src/http/modules/perl/typemap $NGX_OBJS/src/http/modules/perl/
	cp -p src/http/modules/perl/Makefile.PL $NGX_OBJS/src/http/modules/perl/

	cd $NGX_OBJS/src/http/modules/perl				\
		&& NGX_PM_CFLAGS="\$(NGX_PM_CFLAGS) -g $NGX_CC_OPT"	\
			NGX_INCS="$CORE_INCS $NGX_OBJS $HTTP_INCS"	\
		$NGX_PERL Makefile.PL					\
			LIB=$NGX_PERL_MODULES				\
			INSTALLSITEMAN3DIR=$NGX_PERL_MODULES_MAN

END