feature: add timer context support for get_client_body_reader.

Author: zhuizhuhaomeng

lib/resty/http.lua

@@ -972,7 +972,7 @@ function _M.request_uri(self, uri, params)
 end
 
 
-function _M.get_client_body_reader(_, chunksize, sock)
+function _M.get_client_body_reader(_, chunksize, sock, headers)
     chunksize = chunksize or 65536
 
     if not sock then
@@ -992,8 +992,11 @@ function _M.get_client_body_reader(_, chunksize, sock)
         end
     end
 
-    local headers = ngx_req_get_headers()
-    local length = headers.content_length
+    if not headers then
+        headers = ngx_req_get_headers()
+    end
+
+    local length = headers["Content-Length"]
     if length then
         return _body_reader(sock, tonumber(length), chunksize)
     elseif transfer_encoding_is_chunked(headers) then

t/10-clientbodyreader.t

@@ -10,6 +10,8 @@ our $HttpConfig = qq{
     lua_package_path "$pwd/lib/?.lua;/usr/local/share/lua/5.1/?.lua;;";
     error_log logs/error.log debug;
 
+    lua_shared_dict test_dict 1m;
+
     init_by_lua_block {
         if $ENV{TEST_COVERAGE} == 1 then
             jit.off()
@@ -120,3 +122,96 @@ bar\r
 chunked request bodies not supported yet
 --- no_error_log
 [warn]
+
+
+=== TEST 4: Read a body in a timer context with explicitly provided socket and headers
+--- http_config eval: $::HttpConfig
+--- config
+    location = /b {
+        content_by_lua_block {
+            ngx.header["Content-Length"] = 3
+            ngx.print("foo")
+        }
+    }
+
+    location = /a {
+        content_by_lua_block {
+            -- ngx.var / ngx.req.* are not available inside a timer, so
+            -- capture what we need and pass it in explicitly.
+            local port = ngx.var.server_port
+
+            local function handler(premature, port)
+                local sock = ngx.socket.tcp()
+                local ok, err = sock:connect("127.0.0.1", port)
+                if not ok then
+                    ngx.shared.test_dict:set("body", "connect failed: " .. err)
+                    return
+                end
+
+                sock:send("GET /b HTTP/1.0\r\nHost: localhost\r\n\r\n")
+
+                -- Read the status line and response headers off the socket.
+                local content_length
+                while true do
+                    local line = sock:receive("*l")
+                    if not line or line == "" then
+                        break
+                    end
+                    local k, v = line:match("^([^:]+):%s*(.+)$")
+                    if k and k:lower() == "content-length" then
+                        content_length = tonumber(v)
+                    end
+                end
+
+                -- Use the explicit socket + headers overloads since
+                -- ngx.req.socket() / ngx.req.get_headers() do not work here.
+                local httpc = require("resty.http").new()
+                local headers = { ["Content-Length"] = content_length }
+                local reader, err = httpc:get_client_body_reader(8192, sock, headers)
+                if not reader then
+                    ngx.shared.test_dict:set("body", "no reader: " .. (err or "nil"))
+                    return
+                end
+
+                local body = {}
+                repeat
+                    local buffer, err = reader()
+                    if err then
+                        ngx.shared.test_dict:set("body", "read error: " .. err)
+                        return
+                    end
+                    if buffer then
+                        body[#body + 1] = buffer
+                    end
+                until not buffer
+
+                sock:close()
+                ngx.shared.test_dict:set("body", table.concat(body))
+            end
+
+            local ok, err = ngx.timer.at(0, handler, port)
+            if not ok then
+                ngx.say("failed to create timer: ", err)
+                return
+            end
+
+            -- Wait for the timer to finish and store its result.
+            local body
+            for _ = 1, 100 do
+                body = ngx.shared.test_dict:get("body")
+                if body then
+                    break
+                end
+                ngx.sleep(0.01)
+            end
+
+            ngx.say(body)
+        }
+    }
+--- request
+GET /a
+--- response_body
+foo
+--- no_error_log
+[error]
+[warn]