From e96bacd8fd625247f1c98a69ece6e1ddc586ede0 Mon Sep 17 00:00:00 2001 From: kindy lin Date: Wed, 18 Jan 2012 19:44:24 +0800 Subject: [PATCH 1/4] remove ngx_http_upstream_keepalive in util/configure --- util/configure | 1 - 1 file changed, 1 deletion(-) diff --git a/util/configure b/util/configure index 6344eb2..0e75412 100755 --- a/util/configure +++ b/util/configure @@ -70,7 +70,6 @@ my @modules = ( [http_array_var => 'array-var-nginx-module'], [http_memc => 'memc-nginx-module'], [http_redis2 => 'redis2-nginx-module'], - [http_upstream_keepalive => 'upstream-keepalive-nginx-module'], [http_auth_request => 'auth-request-nginx-module'], [http_rds_json => 'rds-json-nginx-module'], [http_rds_csv => 'rds-csv-nginx-module'], From 7ce68bd980110138f94ef8dd17c26fb2129f0953 Mon Sep 17 00:00:00 2001 From: kindy lin Date: Thu, 19 Jan 2012 17:17:12 +0800 Subject: [PATCH 2/4] bumped version number to 1.1.12.4, with v1.0.10.44 merged --- util/ver | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/ver b/util/ver index 33854c2..11ffb37 100755 --- a/util/ver +++ b/util/ver @@ -1,7 +1,7 @@ #!/bin/bash main_ver=1.1.12 -minor_ver=3 +minor_ver=4 version=$main_ver.$minor_ver echo $version From d9782b738db9dd85459b199acdbe681409bcc6a6 Mon Sep 17 00:00:00 2001 From: kindy lin Date: Thu, 19 Jan 2012 17:50:24 +0800 Subject: [PATCH 3/4] remove upstream_keepalive from util/configure --- util/configure | 1 - 1 file changed, 1 deletion(-) diff --git a/util/configure b/util/configure index 6344eb2..0e75412 100755 --- a/util/configure +++ b/util/configure @@ -70,7 +70,6 @@ my @modules = ( [http_array_var => 'array-var-nginx-module'], [http_memc => 'memc-nginx-module'], [http_redis2 => 'redis2-nginx-module'], - [http_upstream_keepalive => 'upstream-keepalive-nginx-module'], [http_auth_request => 'auth-request-nginx-module'], [http_rds_json => 'rds-json-nginx-module'], [http_rds_csv => 'rds-csv-nginx-module'], From 86af3896ba468d2c88e8e80b3607ccf93056c142 Mon Sep 17 00:00:00 2001 From: kindy lin Date: Thu, 19 Jan 2012 17:56:16 +0800 Subject: [PATCH 4/4] bumped version number to 1.1.12.5 --- util/ver | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/ver b/util/ver index 11ffb37..fa5d036 100755 --- a/util/ver +++ b/util/ver @@ -1,7 +1,7 @@ #!/bin/bash main_ver=1.1.12 -minor_ver=4 +minor_ver=5 version=$main_ver.$minor_ver echo $version