nginx-0.3.22-RELEASE import

    *) Feature: the ngx_http_perl_module supports the $r->args and
       $r->unescape methods.

    *) Feature: the method $r->query_string of ngx_http_perl_module was
       canceled.

    *) Bugfix: segmentation fault was occurred if the "none" or "blocked"
       values was specified in the "valid_referers" directive; the bug had
       appeared in 0.3.18.

auto/cc/icc

diff --git a/auto/cc/icc b/auto/cc/icc
index 81b0427..afcabe6 100644
--- a/auto/cc/icc
+++ b/auto/cc/icc
@@ -20,9 +20,6 @@
 # inline any function, at the compiler's discretion
 CFLAGS="$CFLAGS -Ob2"
 
-# single-file IP optimizations
-#IPO="-ip"
-
 # multi-file IP optimizations
 case "$NGX_ICC_VER" in
     9.*)
@@ -34,6 +31,9 @@
     ;;
 esac
 
+# single-file IP optimizations
+#IPO="-ip"
+
 CFLAGS="$CFLAGS $IPO"
 CORE_LINK="$CORE_LINK $IPO"
 CORE_LINK="$CORE_LINK -opt_report_file=$NGX_OBJS/opt_report_file"

auto/lib/perl/make

diff --git a/auto/lib/perl/make b/auto/lib/perl/make
index 3654422..b7c8cb3 100644
--- a/auto/lib/perl/make
+++ b/auto/lib/perl/make
@@ -15,14 +15,16 @@
 	cd $NGX_OBJS/src/http/modules/perl && make
 
 
-$NGX_OBJS/src/http/modules/perl/Makefile: src/http/modules/perl/Makefile.PL
+$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_PERL_CFLAGS="$NGX_PERL_CFLAGS"			\
+		&& NGX_PERL_CFLAGS="$NGX_PERL_CFLAGS $NGX_CC_OPT"	\
 			NGX_PCRE=$PCRE					\
 			NGX_ZLIB=$ZLIB					\
 			NGX_OBJS=$NGX_OBJS				\