Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

minor dev build script updates.

  • Loading branch information...
commit a51d88868967553bdfd2f545369253d8bc41f2f6 1 parent 65002b9
Yichun Zhang authored July 08, 2011
10  util/build.sh
@@ -28,14 +28,15 @@ if [ ! -s "nginx-$version.tar.gz" ]; then
28 28
         cp ~/work/nginx-$version.tar.gz ./ || exit 1
29 29
     else
30 30
         wget "http://sysoev.ru/nginx/nginx-$version.tar.gz" -O nginx-$version.tar.gz || exit 1
  31
+        cp nginx-$version.tar.gz ~/work/
31 32
     fi
32 33
 
33 34
     tar -xzvf nginx-$version.tar.gz || exit 1
  35
+    cp $root/../no-pool-nginx/nginx-$version-no_pool.patch ./ || exit 1
  36
+    patch -p0 < nginx-$version-no_pool.patch || exit 1
34 37
 fi
35 38
 
36 39
 #tar -xzvf nginx-$version.tar.gz || exit 1
37  
-#cp $root/../no-pool-nginx/nginx-$version-no_pool.patch ./ || exit 1
38  
-#patch -p0 < nginx-$version-no_pool.patch || exit 1
39 40
 
40 41
 cd nginx-$version/
41 42
 
@@ -48,7 +49,6 @@ if [[ "$BUILD_CLEAN" -eq 1 || ! -f Makefile || "$root/config" -nt Makefile || "$
48 49
             --without-mail_smtp_module \
49 50
             --without-http_upstream_ip_hash_module \
50 51
             --without-http_empty_gif_module \
51  
-            --without-http_memcached_module \
52 52
             --without-http_referer_module \
53 53
             --without-http_autoindex_module \
54 54
             --without-http_auth_basic_module \
@@ -57,8 +57,8 @@ if [[ "$BUILD_CLEAN" -eq 1 || ! -f Makefile || "$root/config" -nt Makefile || "$
57 57
           --add-module=$root/../ndk-nginx-module \
58 58
           --add-module=$root/../eval-nginx-module \
59 59
           --add-module=$root/../echo-nginx-module \
60  
-          --add-module=$home/work/nginx/ngx_http_upstream_keepalive-2ce9d8a1ca93
61  
-          #--with-debug
  60
+          --add-module=$home/work/nginx/ngx_http_upstream_keepalive-2ce9d8a1ca93 \
  61
+          --with-debug
62 62
           #--add-module=$home/work/nginx/nginx_upstream_hash-0.3 \
63 63
   #--without-http_ssi_module  # we cannot disable ssi because echo_location_async depends on it (i dunno why?!)
64 64
 
15  valgrind.suppress
@@ -142,4 +142,17 @@
142 142
    fun:ngx_alloc
143 143
    fun:ngx_malloc
144 144
 }
145  
-
  145
+{
  146
+   <insert_a_suppression_name_here>
  147
+   Memcheck:Leak
  148
+   fun:malloc
  149
+   fun:ngx_alloc
  150
+   fun:ngx_create_pool
  151
+}
  152
+{
  153
+   <insert_a_suppression_name_here>
  154
+   Memcheck:Leak
  155
+   fun:malloc
  156
+   fun:ngx_alloc
  157
+   fun:ngx_palloc_large
  158
+}

0 notes on commit a51d888

Please sign in to comment.
Something went wrong with that request. Please try again.