updated test suite to reflect recent changes.

again, fix sed issue

util/configure

@@ -59,6 +59,7 @@ my @modules = (
     [http_iconv => 'iconv-nginx-module', 'disabled'],
     [http_echo => 'echo-nginx-module'],
     [http_xss => 'xss-nginx-module'],
+    [http_coolkit => 'ngx_coolkit'],
     [http_set_misc => 'set-misc-nginx-module'],
     [http_form_input => 'form-input-nginx-module'],
     [http_encrypted_session => 'encrypted-session-nginx-module'],
@@ -217,6 +218,11 @@ for my $opt (@ARGV) {
         my $mod_path = File::Spec->rel2abs($1);
         push @ngx_opts, "--add-module=$mod_path";
 
+    } elsif ($opt =~ /^--with-openssl=(.*)/) {
+
+        my $path = File::Spec->rel2abs($1);
+        push @ngx_opts, "--with-openssl=$path";
+
     } elsif ($opt =~ /^--\w.*/) {
         push @ngx_opts, $opt;
 

util/mirror-tarballs

@@ -27,8 +27,8 @@ cd nginx-$ver || exit 1
 # patch the patch
 
 cp $root/patches/nginx-$main_ver-server_header.patch server_header.patch || exit 1
-sed -i $"s/NGINX_VERSION \".unknown\"/NGINX_VERSION \".$minor_ver\"/" \
+sed $"s/NGINX_VERSION \".unknown\"/NGINX_VERSION \".$minor_ver\"/" server_header.patch \
-    server_header.patch || exit 1
+    > server_header.patch.tmp && mv -f server_header.patch.tmp server_header.patch || exit 1
 
 patch -p2 < server_header.patch || exit 1
 
@@ -61,11 +61,13 @@ 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/" \
+sed $"s/NGINX_VERSION \".unknown/NGINX_VERSION \".$minor_ver/" \
-    ./nginx-no_pool.patch || exit 1
+    ./nginx-no_pool.patch > ./nginx-no_pool.patch.tmp && \
+    mv ./nginx-no_pool.patch.tmp ./nginx-no_pool.patch \
+    || exit 1
 rm -rf no-pool-nginx-$ver
 
-ver=0.37rc8
+ver=0.38rc1
 $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 || exit 1
 mv agentzh-echo-nginx-module-* echo-nginx-module-$ver || exit 1
@@ -80,7 +82,7 @@ $root/util/get-tarball "http://github.com/simpl/ngx_devel_kit/tarball/v$ver" -O
 tar -xzf ngx_devel_kit-$ver.tar.gz || exit 1
 mv simpl-ngx_devel_kit-* ngx_devel_kit-$ver || exit 1
 
-ver=0.22rc4
+ver=0.22rc5
 $root/util/get-tarball "http://github.com/agentzh/set-misc-nginx-module/tarball/v$ver" -O set-misc-nginx-module-$ver.tar.gz || exit 1
 tar -xzf set-misc-nginx-module-$ver.tar.gz || exit 1
 mv agentzh-set-misc-nginx-module-* set-misc-nginx-module-$ver || exit 1
@@ -95,21 +97,21 @@ $root/util/get-tarball "http://github.com/agentzh/rds-csv-nginx-module/tarball/v
 tar -xzf rds-csv-nginx-module-$ver.tar.gz || exit 1
 mv agentzh-rds-csv-nginx-module-* rds-csv-nginx-module-$ver || exit 1
 
-ver=0.16rc7
+ver=0.17rc1
 $root/util/get-tarball "http://github.com/agentzh/headers-more-nginx-module/tarball/v$ver" -O headers-more-nginx-module-$ver.tar.gz || exit 1
 tar -xzf headers-more-nginx-module-$ver.tar.gz || exit 1
 mv agentzh-headers-more-nginx-module-* headers-more-nginx-module-$ver || exit 1
 
 #################################
 
-ver=0.1.2rc4
+ver=0.1.2rc6
 $root/util/get-tarball "http://github.com/chaoslawful/drizzle-nginx-module/tarball/v$ver" -O drizzle-nginx-module-$ver.tar.gz || exit 1
 tar -xzf drizzle-nginx-module-$ver.tar.gz || exit 1
 mv chaoslawful-drizzle-nginx-module-* drizzle-nginx-module-$ver || exit 1
 
 #################################
 
-ver=0.3.1rc45
+ver=0.5.0rc6
 $root/util/get-tarball "http://github.com/chaoslawful/lua-nginx-module/tarball/v$ver" -O lua-nginx-module-$ver.tar.gz || exit 1
 tar -xzf lua-nginx-module-$ver.tar.gz || exit 1
 mv chaoslawful-lua-nginx-module-* ngx_lua-$ver || exit 1
@@ -123,7 +125,7 @@ mv agentzh-array-var-nginx-module-* array-var-nginx-module-$ver || exit 1
 
 #################################
 
-ver=0.13rc2
+ver=0.13rc3
 $root/util/get-tarball "http://github.com/agentzh/memc-nginx-module/tarball/v$ver" -O memc-nginx-module-$ver.tar.gz || exit 1
 tar -xzf memc-nginx-module-$ver.tar.gz || exit 1
 mv agentzh-memc-nginx-module-* memc-nginx-module-$ver || exit 1
@@ -151,7 +153,7 @@ mv calio-iconv-nginx-module-* iconv-nginx-module-$ver || exit 1
 
 #################################
 
-ver=0.01
+ver=0.02
 $root/util/get-tarball "http://github.com/agentzh/encrypted-session-nginx-module/tarball/v$ver" -O encrypted-session-nginx-module-$ver.tar.gz || exit 1
 tar -xzf encrypted-session-nginx-module-$ver.tar.gz || exit 1
 mv agentzh-encrypted-session-nginx-module-* encrypted-session-nginx-module-$ver || exit 1
@@ -173,13 +175,20 @@ mv ngx_http_auth_request_module-* auth-request-nginx-module-$ver || exit 1
 
 #################################
 
-ver=0.9rc2
+ver=0.9
 $root/util/get-tarball "https://github.com/FRiCKLE/ngx_postgres/tarball/$ver" -O ngx_postgres-$ver.tar.gz || exit 1
 tar -xzf ngx_postgres-$ver.tar.gz || exit 1
 mv FRiCKLE-ngx_postgres-* ngx_postgres-$ver || exit 1
 
 #################################
 
+ver=0.2rc1
+$root/util/get-tarball "https://github.com/FRiCKLE/ngx_coolkit/tarball/$ver" -O ngx_coolkit-$ver.tar.gz || exit 1
+tar -xzf ngx_coolkit-$ver.tar.gz || exit 1
+mv FRiCKLE-ngx_coolkit-* ngx_coolkit-$ver || exit 1
+
+#################################
+
 ver=0.08rc2
 $root/util/get-tarball "http://github.com/agentzh/redis2-nginx-module/tarball/v$ver" -O redis2-nginx-module-$ver.tar.gz || exit 1
 tar -xzf redis2-nginx-module-$ver.tar.gz || exit 1
@@ -229,7 +238,7 @@ cd ..
 
 #################################
 
-ver=0.09rc5
+ver=0.09rc6
 $root/util/get-tarball "http://github.com/agentzh/lua-redis-parser/tarball/v$ver" -O "lua-redis-parser-$ver.tar.gz" || exit 1
 tar -xzf lua-redis-parser-$ver.tar.gz || exit 1
 mv agentzh-lua-redis-parser-* lua-redis-parser-$ver || exit 1

util/ver

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-main_ver=1.0.10
+main_ver=1.0.11
-minor_ver=41
+minor_ver=9
 version=$main_ver.$minor_ver
 echo $version