Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Drain trailer when setting keepalive to avoid "unread data in buffer" error #274

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Drain trailer when setting keepalive to avoid "unread data in buffer" error #274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions lib/resty/http.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -950,6 +950,9 @@ function _M.request_uri(self, uri, params)
end

else
-- drain trailers if needed
res:read_trailers()

local ok, err = self:set_keepalive(params.keepalive_timeout, params.keepalive_pool)
if not ok then
ngx_log(ngx_ERR, err)
Expand Down
62 changes: 62 additions & 0 deletions t/04-trailers.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,3 +160,65 @@ OK
--- no_error_log
[error]
[warn]



=== TEST 3: Drain trailer when setting keepalive to avoid "unread data in buffer" error
--- http_config eval: $::HttpConfig
--- config
location = /a {
content_by_lua_block {
local http = require "resty.http"
local uri = "http://127.0.0.1:" .. ngx.var.server_port .. "/b"
local httpc = http.new()
local res = assert(httpc:request_uri(uri))
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
local res = assert(httpc:request_uri(uri))
local res = assert(httpc:request_uri(uri, {keepalive = true}))

local hash = ngx.md5(res.body)
if res.headers["Content-MD5"] == hash then
ngx.say("OK")
else
ngx.say(res.headers["Content-MD5"])
end
}
}
location = /b {
content_by_lua_block {
-- We use the raw socket to compose a response, since OpenResty
-- doesnt support trailers natively.

ngx.req.read_body()
local sock, err = ngx.req.socket(true)
if not sock then
ngx.say(err)
end

local res = {}
table.insert(res, "HTTP/1.1 200 OK")
table.insert(res, "Date: " .. ngx.http_time(ngx.time()))
table.insert(res, "Transfer-Encoding: chunked")
table.insert(res, "Trailer: Content-MD5")
table.insert(res, "")

local body = "Hello, World"

table.insert(res, string.format("%x", #body))
table.insert(res, body)
table.insert(res, "0")
table.insert(res, "")

table.insert(res, "Content-MD5: " .. ngx.md5(body))

table.insert(res, "")
table.insert(res, "")
sock:send(table.concat(res, "\r\n"))

-- don't close connection so we can set keepalive in the test
ngx.sleep(0.5)
}
}
--- request
GET /a
--- response_body
OK
--- no_error_log
[error]
[warn]