Permalink
Browse files

confirmed that we work with nginx 1.0.5.

  • Loading branch information...
agentzh committed Aug 9, 2011
1 parent d41681d commit ab601b465acfbe78181dbedcc5cd87188612e86a
Showing with 30 additions and 63 deletions.
  1. +1 −0 .gitignore
  2. +1 −1 README
  3. +21 −62 util/build.sh
  4. +7 −0 valgrind.suppress
View
@@ -1,3 +1,4 @@
buildroot/
*.mobi
genmobi.sh
.libs
View
2 README
@@ -68,7 +68,7 @@ Limitations
Compatibility
The following versions of Nginx should work with this module:
* 1.0.x (last tested: 1.0.2)
* 1.0.x (last tested: 1.0.5)
* 0.9.x (last tested: 0.9.4)
View
@@ -5,68 +5,27 @@
root=`pwd`
home=~
cd ~/work
version=$1
#opts=$2
target=$root/work/nginx
rm -f ~/work/nginx-$version/objs/addon/src/ndk.o
rm -f ~/work/nginx-$version/objs/addon/ndk/ndk.o \
~/work/nginx-$version/objs/addon/ndk-nginx-module/ndk.o
if [ ! -d ./buildroot ]; then
mkdir ./buildroot || exit 1
fi
cd buildroot || exit 1
if [ ! -s "nginx-$version.tar.gz" ]; then
if [ -f ~/work/nginx-$version.tar.gz ]; then
cp ~/work/nginx-$version.tar.gz ./ || exit 1
else
wget "http://sysoev.ru/nginx/nginx-$version.tar.gz" -O nginx-$version.tar.gz || exit 1
fi
tar -xzvf nginx-$version.tar.gz || exit 1
fi
#tar -xzvf nginx-$version.tar.gz || exit 1
#cp $root/../no-pool-nginx/nginx-$version-no_pool.patch ./ || exit 1
#patch -p0 < nginx-$version-no_pool.patch || exit 1
#patch -p0 < ~/work/nginx-$version-rewrite_phase_fix.patch || exit 1
cd nginx-$version/
if [[ "$BUILD_CLEAN" = 1 || ! -f Makefile || "$root/config" -nt Makefile || "$root/util/build.sh" -nt Makefile ]]; then
./configure --prefix=$target \
--with-cc-opt="-O0" \
--without-mail_pop3_module \
--without-mail_imap_module \
--without-mail_smtp_module \
--without-http_upstream_ip_hash_module \
--without-http_empty_gif_module \
--without-http_memcached_module \
--without-http_referer_module \
--without-http_autoindex_module \
--without-http_auth_basic_module \
--without-http_userid_module \
--add-module=$root/../echo-nginx-module \
--add-module=$root/../ndk-nginx-module \
--add-module=$root $opts \
--add-module=$root/../set-misc-nginx-module \
--add-module=$root/../array-var-nginx-module \
--with-debug
#--add-module=$home/work/ndk \
force=$2
ngx-build $force $version \
--with-cc-opt="-O0" \
--without-mail_pop3_module \
--without-mail_imap_module \
--without-mail_smtp_module \
--without-http_upstream_ip_hash_module \
--without-http_empty_gif_module \
--without-http_memcached_module \
--without-http_referer_module \
--without-http_autoindex_module \
--without-http_auth_basic_module \
--without-http_userid_module \
--add-module=$root/../echo-nginx-module \
--add-module=$root/../ndk-nginx-module \
--add-module=$root $opts \
--add-module=$root/../set-misc-nginx-module \
--add-module=$root/../array-var-nginx-module \
--with-debug
#--add-module=$home/work/ndk \
#--without-http_ssi_module # we cannot disable ssi because echo_location_async depends on it (i dunno why?!)
fi
if [ -f $target/sbin/nginx ]; then
rm -f $target/sbin/nginx
fi
if [ -f $target/logs/nginx.pid ]; then
kill `cat $target/logs/nginx.pid`
fi
make -j3
make install
View
@@ -1,3 +1,10 @@
{
<insert_a_suppression_name_here>
Memcheck:Leak
fun:malloc
fun:ngx_alloc
fun:ngx_create_pool
}
{
<insert_a_suppression_name_here>
Memcheck:Leak

0 comments on commit ab601b4

Please sign in to comment.