From 9bcdd4b62f8746334d7a7127558e3a8924d505f0 Mon Sep 17 00:00:00 2001 From: "Yichun Zhang (agentzh)" Date: Tue, 23 Jun 2015 22:33:01 +0800 Subject: [PATCH] util/dist-check: the nogzip build now also disables ssl and pcre. --- util/dist-check | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/util/dist-check b/util/dist-check index 2ef7440..f904555 100755 --- a/util/dist-check +++ b/util/dist-check @@ -30,7 +30,7 @@ if ($^O eq 'freebsd' || $^O eq 'solaris') { $make = 'make'; } -my $cfg_opts = "--with-http_iconv_module"; +my $cfg_opts = ""; if ($opts{l}) { $lua = 'Lua'; @@ -65,16 +65,18 @@ sub write_config_file ($) { write_config_file "/tmp/nginx.conf"; -warn "=== Without Gzip ===\n"; +warn "=== Without Gzip/SSL/PCRE ===\n"; $prefix = "/usr/local/openresty-nogzip"; unless ($opts{f}) { - sh "./configure $cfg_opts --without-http_gzip_module --prefix=$prefix -j$jobs > /dev/null"; + sh "./configure $cfg_opts --without-http_rewrite_module --without-http_ssl_module --without-pcre --without-http_gzip_module --prefix=$prefix -j$jobs > /dev/null"; } sh "$make -j$jobs > /dev/null"; sh "sudo $make install > /dev/null"; sh "sudo cp /tmp/nginx.conf $prefix/nginx/conf/nginx.conf"; sh "$prefix/nginx/sbin/nginx -V 2>&1 |grep $ver"; sh "$prefix/nginx/sbin/nginx -V 2>&1 |grep '\\--without-http_gzip_module'"; +sh "$prefix/nginx/sbin/nginx -V 2>&1 |grep -v -q '\\--with-http_ssl_module'"; +sh "$prefix/nginx/sbin/nginx -V 2>&1 |grep '\\--without-pcre'"; system "sudo killall nginx > /dev/null 2>&1"; sh "sudo $prefix/nginx/sbin/nginx"; sh "curl -si localhost/lua|grep $lua"; @@ -83,6 +85,8 @@ sh "curl -si localhost/cjson|grep 'json.safe: '"; sh qq{$prefix/bin/resty -e 'ngx.say("Hello World!")'|grep 'Hello World'}; sh "sudo $prefix/nginx/sbin/nginx -sstop"; +$cfg_opts .= " --with-http_iconv_module"; + warn "\n=== No Pool Build ===\n"; $prefix = "/usr/local/openresty-nopool"; unless ($opts{f}) {