releng for 1.0.15.3.

patches/nginx-1.0.15-filter_finalize_hang.patch

@@ -0,0 +1,10 @@
+--- nginx-1.0.15/src/http/ngx_http_request.c	2012-03-05 20:49:32.000000000 +0800
++++ nginx-1.0.15-patched/src/http/ngx_http_request.c	2012-05-11 20:50:01.478111234 +0800
+@@ -1900,6 +1900,7 @@
+ 
+     if (rc == NGX_OK && r->filter_finalize) {
+         c->error = 1;
++        ngx_http_finalize_connection(r);
+         return;
+     }
+ 

patches/nginx-1.0.15-reset_wev_handler_in_named_locations.patch

@@ -0,0 +1,11 @@
+--- nginx-1.0.15/src/http/ngx_http_core_module.c	2012-03-05 21:03:39.000000000 +0800
++++ nginx-1.0.15-patched/src/http/ngx_http_core_module.c	2012-05-02 21:57:40.624937882 +0800
+@@ -2567,6 +2567,8 @@
+ 
+             r->phase_handler = cmcf->phase_engine.location_rewrite_index;
+ 
++            r->write_event_handler = ngx_http_core_run_phases;
++
+             ngx_http_core_run_phases(r);
+ 
+             return NGX_DONE;

util/configure

@@ -71,6 +71,7 @@ my @modules = (
     [http_array_var => 'array-var-nginx-module'],
     [http_memc => 'memc-nginx-module'],
     [http_redis2 => 'redis2-nginx-module'],
+    [http_redis => 'redis-nginx-module'],
     [http_upstream_keepalive => 'upstream-keepalive-nginx-module'],
     [http_auth_request => 'auth-request-nginx-module'],
     [http_rds_json => 'rds-json-nginx-module'],

util/mirror-tarballs

@@ -60,6 +60,12 @@ patch -p1 < $root/patches/nginx-$main_ver-allow_request_body_updating.patch || e
 
 patch -p1 < $root/patches/nginx-$main_ver-log_escape_non_ascii.patch || exit 1
 
+echo applying reset_wev_handler_in_named_locations.patch ...
+patch -p1 < $root/patches/nginx-$main_ver-reset_wev_handler_in_named_locations.patch || exit 1
+
+echo applying filter_finalize_hang.patch ...
+patch -p1 < $root/patches/nginx-$main_ver-filter_finalize_hang.patch || exit 1
+
 #echo "INFO: applying null-character-fixes patch"
 #patch -p0 < $root/patches/nginx-$main_ver-null_character_fixes.patch || exit 1
 
@@ -91,7 +97,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.22rc7
+ver=0.22rc8
 $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
@@ -120,7 +126,7 @@ mv chaoslawful-drizzle-nginx-module-* drizzle-nginx-module-$ver || exit 1
 
 #################################
 
-ver=0.5.0rc25
+ver=0.5.0rc27
 $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
@@ -141,7 +147,7 @@ mv agentzh-memc-nginx-module-* memc-nginx-module-$ver || exit 1
 
 #################################
 
-ver=0.13rc6
+ver=0.13rc8
 $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
@@ -184,6 +190,12 @@ mv ngx_http_auth_request_module-* auth-request-nginx-module-$ver || exit 1
 
 #################################
 
+ver=0.3.6
+$root/util/get-tarball "http://people.freebsd.org/~osa/ngx_http_redis-$ver.tar.gz" -O redis-nginx-module-$ver.tar.gz || exit 1
+tar -xzf redis-nginx-module-$ver.tar.gz || exit 1
+mv ngx_http_redis-* redis-nginx-module-$ver || exit 1
+
+#################################
 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
@@ -248,21 +260,21 @@ cd ..
 
 #################################
 
-ver=0.09rc7
+ver=0.09
 $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
 
 #################################
 
-ver=0.04
+ver=0.05
 $root/util/get-tarball "http://github.com/agentzh/lua-rds-parser/tarball/v$ver" -O "lua-rds-parser-$ver.tar.gz" || exit 1
 tar -xzf lua-rds-parser-$ver.tar.gz || exit 1
 mv agentzh-lua-rds-parser-* lua-rds-parser-$ver || exit 1
 
 #################################
 
-ver=0.06
+ver=0.07
 $root/util/get-tarball "http://github.com/agentzh/lua-resty-memcached/tarball/v$ver" -O "lua-resty-memcached-$ver.tar.gz" || exit 1
 tar -xzf lua-resty-memcached-$ver.tar.gz || exit 1
 mv agentzh-lua-resty-memcached-* lua-resty-memcached-$ver || exit 1
@@ -283,7 +295,7 @@ mv agentzh-lua-resty-mysql-* lua-resty-mysql-$ver || exit 1
 
 #################################
 
-ver=0.02
+ver=0.03
 $root/util/get-tarball "http://github.com/agentzh/lua-resty-upload/tarball/v$ver" -O "lua-resty-upload-$ver.tar.gz" || exit 1
 tar -xzf lua-resty-upload-$ver.tar.gz || exit 1
 mv agentzh-lua-resty-upload-* lua-resty-upload-$ver || exit 1

util/ver

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 main_ver=1.0.15
-minor_ver=1
+minor_ver=3
 version=$main_ver.$minor_ver
 echo $version