Merge pull request #185 from bungle/feat/content-length

Add Content-Length: 0 header on POST/PUT/PATCH when the body is absent

Author: hamishforbes

lib/resty/http.lua

@@ -55,6 +55,13 @@ local HOP_BY_HOP_HEADERS = {
 }
 
 
+local EXPECTING_BODY = {
+    POST  = true,
+    PUT   = true,
+    PATCH = true,
+}
+
+
 -- Reimplemented coroutine.wrap, returning "nil, err" if the coroutine cannot
 -- be resumed. This protects user code from inifite loops when doing things like
 -- repeat
@@ -603,8 +610,13 @@ function _M.send_request(self, params)
     end
 
     -- Ensure minimal headers are set
-    if type(body) == 'string' and not headers["Content-Length"] then
-        headers["Content-Length"] = #body
+
+    if not headers["Content-Length"] then
+        if type(body) == 'string' then
+            headers["Content-Length"] = #body
+        elseif body == nil and EXPECTING_BODY[str_upper(params.method)] then
+            headers["Content-Length"] = 0
+        end
     end
     if not headers["Host"] then
         if (str_sub(self.host, 1, 5) == "unix:") then

t/06-simpleinterface.t

@@ -267,3 +267,72 @@ GET /a
 nil closed
 --- error_log
 lua tcp socket read timed out
+
+
+=== TEST 7: Content-Length is set on POST/PUT/PATCH requests when body is absent
+--- http_config eval: $::HttpConfig
+--- config
+    location = /a {
+        content_by_lua '
+            for i, method in ipairs({ "POST", "PUT", "PATCH" }) do
+              local http = require "resty.http"
+              local httpc = http.new()
+              local res, err = httpc:request_uri("http://127.0.0.1:"..ngx.var.server_port.."/b", { method = method })
+
+              if not res then
+                  ngx.log(ngx.ERR, err)
+              end
+
+              if i == 1 then
+                ngx.status = res.status
+              end
+
+              ngx.print(res.body)
+            end
+        ';
+    }
+    location = /b {
+        content_by_lua '
+            ngx.say(ngx.req.get_method(), " Content-Length: ", ngx.req.get_headers()["Content-Length"])
+        ';
+    }
+--- request
+GET /a
+--- response_body
+POST Content-Length: 0
+PUT Content-Length: 0
+PATCH Content-Length: 0
+--- no_error_log
+[error]
+[warn]
+
+
+=== TEST 8: Content-Length is not set on GET requests when body is absent
+--- http_config eval: $::HttpConfig
+--- config
+    location = /a {
+        content_by_lua '
+            local http = require "resty.http"
+            local httpc = http.new()
+            local res, err = httpc:request_uri("http://127.0.0.1:"..ngx.var.server_port.."/b")
+
+            if not res then
+                ngx.log(ngx.ERR, err)
+            end
+            ngx.status = res.status
+            ngx.print(res.body)
+        ';
+    }
+    location = /b {
+        content_by_lua '
+            ngx.say("Content-Length: ", type(ngx.req.get_headers()["Content-Length"]))
+        ';
+    }
+--- request
+GET /a
+--- response_body
+Content-Length: nil
+--- no_error_log
+[error]
+[warn]
+