Rework simple interface keepalive settings

Author: hamishforbes

README.md

@@ -275,10 +275,13 @@ When the request is successful, `res` will contain the following fields:
 
 `syntax: res, err = httpc:request_uri(uri, params)`
 
-The simple interface. Options supplied in the `params` table are the same as in the generic interface, and will override components found in the uri itself, Moreover you can set keepalive options with to fileds:
+The simple interface. Options supplied in the `params` table are the same as in the generic interface, and will override components found in the uri itself.
 
-* `keepalive_timeout` A value for tcpsock:setkeepalive (default is 0), Set `-1` to close connection immediately.
-* `keepalive_pool` A value for tcpsock:setkeepalive (default is lua_socket_pool_size).
+There are 3 additional parmaters for controlling keepalives:
+
+* `keepalive` Set to `false` to disable keepalives and immediately close the connection.
+* `keepalive_timeout` The maximal idle timeout (ms). Defaults to `lua_socket_keepalive_timeout`.
+* `keepalive_pool` The maxmimal number of connections in the pool. Defaults to `lua_socket_pool_size`.
 
 In this mode, there is no need to connect manually first. The connection is made on your behalf, suiting cases where you simply need to grab a URI without too much hassle.
 

lib/resty/http.lua

@@ -873,31 +873,18 @@ function _M.request_uri(self, uri, params)
 
     res.body = body
 
-    local ok, err
-    if params.keepalive_timeout == nil then
-      ok, err = self:set_keepalive()
-      if not ok then
-          ngx_log(ngx_ERR, err)
-      end
-    else
-      if params.keepalive_timeout == -1 then
-        ok, err = self:close()
+    if params.keepalive == false then
+        local ok, err = self:close()
         if not ok then
             ngx_log(ngx_ERR, err)
         end
-      else
-        if params.keepalive_pool then
-          ok, err = self:set_keepalive(params.keepalive_timeout, params.keepalive_pool)
-          if not ok then
-              ngx_log(ngx_ERR, err)
-          end
-        else
-          ok, err = self:set_keepalive(params.keepalive_timeout)
-          if not ok then
-              ngx_log(ngx_ERR, err)
-          end
+
+    else
+        local ok, err = self:set_keepalive(params.keepalive_timeout, params.keepalive_pool)
+        if not ok then
+            ngx_log(ngx_ERR, err)
         end
-      end
+
     end
 
     return res, nil