Merge branch 'nginx-1.1.x' of github.com:agentzh/ngx_openresty into nginx-1.1.x

2012-01-19 18:12:58 +08:00 · 2012-01-19 18:12:58 +08:00 · fd80fa22ef
parent 2bffe13e20 92e0dd7abf
commit fd80fa22ef
2 changed files with 1 additions and 2 deletions
--- 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'],
--- a/util/ver
+++ b/util/ver
@ -1,7 +1,7 @@
 #!/bin/bash

 main_ver=1.1.12
-minor_ver=3
+minor_ver=5
 version=$main_ver.$minor_ver
 echo $version