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

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'],

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