Merge branch 'master' of github.com:agentzh/ngx_openresty

util/configure

@@ -5,7 +5,6 @@ use strict;
 use warnings;
 
 use File::Spec;
-use ExtUtils::MakeMaker ();
 
 sub shell ($@);
 sub env ($$);
@@ -59,7 +58,7 @@ my @modules = (
     [http_set_misc => 'set-misc-nginx-module'],
     [http_form_input => 'form-input-nginx-module'],
     [http_encrypted_session => 'encrypted-session-nginx-module'],
-    [http_drizzle => 'drizzle-nginx-module', $on_solaris ? 'disabled' : () ],
+    [http_drizzle => 'drizzle-nginx-module', 'disabled'],
     [http_postgres => 'ngx_postgres', 'disabled'],
     [http_lua => 'ngx_lua'],
     [http_headers_more => 'headers-more-nginx-module'],
@@ -148,6 +147,9 @@ for my $opt (@ARGV) {
     } elsif ($opt eq '--with-luajit') {
         $resty_opts{luajit} = 1;
 
+    } elsif ($opt =~ /^--with-libdrizzle=(.*)/) {
+        $resty_opts{libdrizzle} = $1;
+
     } elsif ($opt eq '--with-http_ssl_module') {
         $resty_opts{http_ssl} = 1;
         push @ngx_opts, $opt;
@@ -249,15 +251,6 @@ sub build_resty_opts {
         $opts->{lua} = 1;
     }
 
-    if ($on_solaris) {
-        if ($opts->{http_drizzle}) {
-            $opts->{libdrizzle} = 1;
-        }
-
-    } elsif (! $opts->{no_http_drizzle}) {
-        $opts->{libdrizzle} = 1;
-    }
-
     if ($opts->{no_http_ssl} && $opts->{http_ssl}) {
         die "--with-http_ssl_module conflicts with --without-http_ssl_module.\n";
     }
@@ -267,6 +260,10 @@ sub build_resty_opts {
         push @ngx_opts, '--with-http_ssl_module';
     }
 
+    if (! $opts->{http_drizzle} && $opts->{libdrizzle}) {
+        die "The http_drizzle_module is not enabled while --with-libdrizzle is specified.\n";
+    }
+
     if ($platform eq 'linux' && $opts->{luajit} && ! can_run("ldconfig")) {
         die "you need to have ldconfig in your PATH env when enabling luajit.\n";
     }
@@ -291,41 +288,17 @@ sub build_resty_opts {
         die "build/ directory already exists\n";
     }
 
-    shell "cp -r bundle/ build/";
+    shell "cp -rp bundle/ build/";
 
     cd 'build';
 
     # build 3rd-party C libraries if required
 
-    if ($opts->{libdrizzle}) {
-        my $libdrizzle_src = auto_complete 'libdrizzle';
-        my $libdrizzle_prefix = "$prefix/libdrizzle";
-        my $libdrizzle_root = File::Spec->rel2abs("libdrizzle-root");
-
-        if (-d $libdrizzle_root) {
-            shell "rm -rf $libdrizzle_root";
-        }
-
-        mkdir $libdrizzle_root or
-            die "create create directory libdrizzle-root: $!\n";
-
-        cd $libdrizzle_src;
-
-        shell "./configure --prefix=$libdrizzle_prefix", $dry_run;
-        shell "make", $dry_run;
-        shell "make install DESTDIR=$libdrizzle_root", $dry_run;
-
-        push @make_cmds, "cd build/$libdrizzle_src && \$(MAKE)";
-
-        push @make_install_cmds, "cd build/$libdrizzle_src && "
-            . "\$(MAKE) install DESTDIR=\$(DESTDIR)";
-
-        env LIBDRIZZLE_LIB => "$libdrizzle_root$libdrizzle_prefix/lib";
-        env LIBDRIZZLE_INC => "$libdrizzle_root$libdrizzle_prefix/include";
-
-        push @ngx_rpaths, "$libdrizzle_prefix/lib";
-
-        cd '..';
+    if (my $drizzle_prefix = $opts->{libdrizzle}) {
+        my $drizzle_lib = "$drizzle_prefix/lib";
+        env LIBDRIZZLE_LIB => "$drizzle_prefix/lib";
+        env LIBDRIZZLE_INC => "$drizzle_prefix/include/libdrizzle-1.0";
+        push @ngx_rpaths, $drizzle_lib;
     }
 
     if ($opts->{luajit}) {
@@ -482,6 +455,7 @@ _EOC_
 
   --without-lua51                    disable the bundled Lua 5.1 interpreter
   --with-luajit                      enable LuaJIT 2.0
+  --with-libdrizzle=DIR              specify the libdrizzle 1.0 installation prefix
 
 Options directly inherited from nginx
 
@@ -639,12 +613,15 @@ sub can_run {
 
         #warn "can run: @_\n";
         my $_cmd = $cmd;
-        return $_cmd if (-x $_cmd or $_cmd = MM->maybe_command($_cmd));
+        return $_cmd if -x $_cmd;
 
-        for my $dir ((split /$Config::Config{path_sep}/, $ENV{PATH}), '.') {
+        # FIXME: this is a hack; MSWin32 is not supported anyway
+        my $path_sep = ':';
+
+        for my $dir ((split /$path_sep/, $ENV{PATH}), '.') {
                 next if $dir eq '';
                 my $abs = File::Spec->catfile($dir, $_[0]);
-                return $abs if (-x $abs or $abs = MM->maybe_command($abs));
+                return $abs if -x $abs;
         }
 
         return;

util/fix-tests

@@ -68,7 +68,7 @@ for my $t_file (@t_files) {
     close $in;
 }
 
-print join("\n", map { "    $_" } sort @dirs), "\n";
+print join("\n", map { /^LuaJIT/ ? "* ~$_" : "* $_" } sort @dirs), "\n";
 
 sub cd ($) {
     my $dir = shift;

util/mirror-tarballs

@@ -32,20 +32,28 @@ sed -i $"s/NGINX_VERSION \".unknown\"/NGINX_VERSION \".$minor_ver\"/" \
 
 patch -p2 < server_header.patch || exit 1
 
-patch -p1 < $root/patches/nginx-$main_ver-redirect_memcpy_overlap.patch || exit 1
+#patch -p1 < $root/patches/nginx-$main_ver-redirect_memcpy_overlap.patch || exit 1
 
 patch -p1 < $root/patches/nginx-$main_ver-no_error_pages.patch || exit 1
 
+patch -p1 < $root/patches/nginx-$main_ver-no_Werror.patch || exit 1
+
+patch -p1 < $root/patches/nginx-$main_ver-request_body_preread_fix.patch || exit 1
+
+patch -p1 < $root/patches/nginx-$main_ver-request_body_in_single_buf.patch || exit 1
+
+patch -p1 -l < $root/patches/nginx-$main_ver-subrequest_loop.patch || exit 1
+
 rm -f *.patch || exit 1
 
 cd .. || exit 1
 
-ver=0.36rc3
+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
 
-ver=0.03rc2
+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
 tar -xzf xss-nginx-module-$ver.tar.gz || exit 1
 mv agentzh-xss-nginx-module-* xss-nginx-module-$ver || exit 1
@@ -60,26 +68,26 @@ $root/util/get-tarball "http://github.com/agentzh/set-misc-nginx-module/tarball/
 tar -xzf set-misc-nginx-module-$ver.tar.gz || exit 1
 mv agentzh-set-misc-nginx-module-* set-misc-nginx-module-$ver || exit 1
 
-ver=0.11rc2
+ver=0.11
 $root/util/get-tarball "http://github.com/agentzh/rds-json-nginx-module/tarball/v$ver" -O rds-json-nginx-module-$ver.tar.gz || exit 1
 tar -xzf rds-json-nginx-module-$ver.tar.gz || exit 1
 mv agentzh-rds-json-nginx-module-* rds-json-nginx-module-$ver || exit 1
 
-ver=0.15rc3
+ver=0.15
 $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.0.15rc10
+ver=0.1.1rc1
 $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.1.6rc14
+ver=0.2.0
 $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
@@ -93,14 +101,14 @@ mv agentzh-array-var-nginx-module-* array-var-nginx-module-$ver || exit 1
 
 #################################
 
-ver=0.12rc1
+ver=0.12
 $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
 
 #################################
 
-ver=0.12rc4
+ver=0.12
 $root/util/get-tarball "http://github.com/agentzh/srcache-nginx-module/tarball/v$ver" -O srcache-nginx-module-$ver.tar.gz || exit 1
 tar -xzf srcache-nginx-module-$ver.tar.gz || exit 1
 mv agentzh-srcache-nginx-module-* srcache-nginx-module-$ver || exit 1
@@ -150,7 +158,7 @@ mv FRiCKLE-ngx_postgres-* ngx_postgres-$ver || exit 1
 
 #################################
 
-ver=0.07rc2
+ver=0.07rc5
 $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
 mv agentzh-redis2-nginx-module-* redis2-nginx-module-$ver || exit 1
@@ -177,23 +185,11 @@ rm lua-makefile-fix.patch
 
 #################################
 
-ver=2.0.0-beta7
+ver=2.0.0-beta8
 $root/util/get-tarball "http://luajit.org/download/LuaJIT-$ver.tar.gz" -O "LuaJIT-$ver.tar.gz" || exit 1
 tar -xzf LuaJIT-$ver.tar.gz || exit 1
 
-patch -p0 < $root/patches/LuaJIT-$ver-symlink_lib.patch || exit 1
-
-#################################
-
-ver=0.8
-$root/util/get-tarball "http://launchpad.net/libdrizzle/trunk/0.8/+download/libdrizzle-0.8.tar.gz" -O "libdrizzle-$ver.tar.gz" || exit 1
-tar -xzf libdrizzle-$ver.tar.gz || exit 1
-
-$root/util/get-tarball "http://agentzh.org/misc/nginx/libdrizzle-0.8-parsebug_and_mac_fixes.patch" -O "parsebug_and_mac_fixes.patch" || exit 1
-
-patch -p0 < parsebug_and_mac_fixes.patch
-
-rm parsebug_and_mac_fixes.patch || exit 1
+#patch -p0 < $root/patches/LuaJIT-$ver-symlink_lib.patch || exit 1
 
 #################################
 

util/ver

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-main_ver=0.8.54
-minor_ver=7rc2
+main_ver=1.0.4
+minor_ver=0
 version=$main_ver.$minor_ver
 echo $version