http.server: smarter res:add()

2 files changed, 6 insertions, 19 deletions

diff --git a/lem/hathaway.lua b/lem/hathaway.lua
index 83c192a..7359865 100644
--- a/lem/hathaway.lua
+++ b/lem/hathaway.lua
@@ -106,23 +106,6 @@ do
 		M.OPTIONSM = match_setter('OPTIONS')
 	end
 
-	local Response = {}
-	Response.__index = Response
-	M.Response = Response
-
-	function new_response(req)
-		local n = 0
-		return setmetatable({
-			headers = {},
-			status  = 200,
-			version = req.version,
-			add     = function(self, ...)
-				n = n + 1
-				self[n] = format(...)
-			end
-		}, Response)
-	end
-
 	local function check_match(entry, req, res, ok, ...)
 		if not ok then return false end
 		local handler = entry[req.method]
diff --git a/lem/http/server.lua b/lem/http/server.lua
index 5e19006..378c8f6 100644
--- a/lem/http/server.lua
+++ b/lem/http/server.lua
@@ -178,9 +178,13 @@ do
 		return setmetatable({
 			headers = {},
 			version = req.version,
-			add     = function(self, ...)
+			add     = function(self, fmt, first, ...)
 				n = n + 1
-				self[n] = format(...)
+				if first then
+					self[n] = format(fmt, first, ...)
+				else
+					self[n] = fmt
+				end
 			end
 		}, Response)
 	end