mirror of
https://github.com/openresty/openresty.git
synced 2024-10-13 00:29:41 +00:00
added the --with-no-pool-patch option to the ./configure script, to allow enabling the no-pool patch for debugging memory issues with valgrind, for example. released ngx_openresty 1.0.4.2rc5.
This commit is contained in:
16
util/configure
vendored
16
util/configure
vendored
@ -160,6 +160,9 @@ for my $opt (@ARGV) {
|
||||
} elsif ($opt =~ /^--with-libpq=(.*)/) {
|
||||
$resty_opts{libpq} = $1;
|
||||
|
||||
} elsif ($opt eq '--with-no-pool-patch') {
|
||||
$resty_opts{no_pool} = 1;
|
||||
|
||||
} elsif ($opt eq '--with-http_ssl_module') {
|
||||
$resty_opts{http_ssl} = 1;
|
||||
push @ngx_opts, $opt;
|
||||
@ -310,6 +313,14 @@ sub build_resty_opts {
|
||||
|
||||
# build 3rd-party C libraries if required
|
||||
|
||||
if ($opts->{no_pool}) {
|
||||
if (! can_run("patch")) {
|
||||
die "no \"patch\" utility found in your PATH environment.\n";
|
||||
}
|
||||
|
||||
shell "patch -p0 < nginx-no_pool.patch";
|
||||
}
|
||||
|
||||
if (my $drizzle_prefix = $opts->{libdrizzle}) {
|
||||
my $drizzle_lib = "$drizzle_prefix/lib";
|
||||
env LIBDRIZZLE_LIB => $drizzle_lib;
|
||||
@ -436,7 +447,10 @@ sub usage ($) {
|
||||
|
||||
--prefix=PATH set the installation prefix
|
||||
|
||||
--with-debug enable the debugging logging and also enable -O0
|
||||
--with-debug enable the debugging logging and also enable -O0 -g for gcc.
|
||||
this not only affects nginx, but also other components.
|
||||
|
||||
--with-no-pool-patch enable the no-pool patch for debugging memory issues.
|
||||
|
||||
_EOC_
|
||||
|
||||
|
@ -48,10 +48,15 @@ rm -f *.patch || exit 1
|
||||
|
||||
cd .. || exit 1
|
||||
|
||||
cp $root/patches/nginx-$main_ver-no_pool.patch ./nginx-no_pool.patch || exit 1
|
||||
sed -i $"s/NGINX_VERSION \".unknown/NGINX_VERSION \".$minor_ver/" \
|
||||
./nginx-no_pool.patch || exit 1
|
||||
rm -rf no-pool-nginx-$ver
|
||||
|
||||
ver=0.37rc1
|
||||
$root/util/get-tarball "http://github.com/agentzh/echo-nginx-module/tarball/v$ver" -O echo-nginx-module-$ver.tar.gz || exit 1
|
||||
tar -xzf echo-nginx-module-$ver.tar.gz
|
||||
mv agentzh-echo-nginx-module-* echo-nginx-module-$ver
|
||||
tar -xzf echo-nginx-module-$ver.tar.gz || exit 1
|
||||
mv agentzh-echo-nginx-module-* echo-nginx-module-$ver || exit 1
|
||||
|
||||
ver=0.03rc3
|
||||
$root/util/get-tarball "http://github.com/agentzh/xss-nginx-module/tarball/v$ver" -O xss-nginx-module-$ver.tar.gz || exit 1
|
||||
|
Reference in New Issue
Block a user