Merge head table with headers table in http-codec.

creationix · creationix · commit 9962a091ae2d · 2014-11-11T12:46:54.000-06:00
diff --git a/app/modules/http-codec.lua b/app/modules/http-codec.lua
@@ -32,7 +32,6 @@ local function decoder(read, write, isClient)
     local head = chunk
     local item
     local offset = 1
-    local headers = {}
     local contentLength
     local chunkedEncoding
     while true do
@@ -45,7 +44,7 @@ local function decoder(read, write, isClient)
 
       -- If this is the first line, parse it special
       elseif not item then
-        item = { headers = headers }
+        item = {}
         if isClient then
           item.version, item.code, item.reason = string.match(head, "^HTTP/(%d%.%d) (%d+) ([^\r]+)\r\n", offset)
           item.version = tonumber(item.version)
@@ -68,7 +67,7 @@ local function decoder(read, write, isClient)
         elseif lowerKey == "connection" then
           item.keepAlive = string.lower(value) == "keep-alive"
         end
-        headers[#headers + 1] = {key, value}
+        item[#item + 1] = {key, value}
         offset = s + 2
 
       -- When a double "\r\n\r\n" if found, we're done with the head.
@@ -177,15 +176,13 @@ local function encoder(read, write, isClient)
       local reason = item.reason or STATUS_CODES[item.code]
       head = { 'HTTP/' .. version .. ' ' .. item.code .. ' ' .. reason .. '\r\n' }
     end
-    if item.headers then
-      for i = 1, #item.headers do
-        local key, value = unpack(item.headers[i])
-        local lowerKey = string.lower(key)
-        if lowerKey == "transfer-encoding" then
-          chunkedEncoding = string.lower(value) == "chunked"
-        end
-        head[#head + 1] = key .. ': ' .. tostring(value) .. '\r\n'
+    for i = 1, #item do
+      local key, value = unpack(item[i])
+      local lowerKey = string.lower(key)
+      if lowerKey == "transfer-encoding" then
+        chunkedEncoding = string.lower(value) == "chunked"
       end
+      head[#head + 1] = key .. ': ' .. tostring(value) .. '\r\n'
     end
     head[#head + 1] = '\r\n'
     write(table.concat(head))
diff --git a/bench/http-cluster/README.md b/bench/http-cluster/README.md
@@ -116,20 +116,18 @@ local function app(read, write)
     print(req.method, req.url)
 
     local body = req.path .. "\n"
-    local headers = {
+    local head = {
+      code = 200,
       { "Server", "Luvit" },
       { "Content-Type", "text/plain" },
       { "Content-Length", #body },
     }
     if req.keepAlive then
-      headers[#headers + 1] = { "Connection", "Keep-Alive" }
+      head[#head + 1] = { "Connection", "Keep-Alive" }
     end
 
     -- Write the response headers and body
-    write {
-      code = 200,
-      headers = headers
-    }
+    write(head)
     write(body)
 
     -- If the request didn't support keepalive, we should break the loop
diff --git a/bench/http-cluster/app.lua b/bench/http-cluster/app.lua
@@ -23,19 +23,17 @@ return function (read, write)
   for req in read do
     -- print("Writing response headers")
     local body = req.path .. "\n"
-    local headers = {
+    local res = {
+      code = 200,
       { "Server", "Luvit" },
       { "Content-Type", "text/plain" },
       { "Content-Length", #body },
     }
     if req.keepAlive then
-      headers[#headers + 1] = { "Connection", "Keep-Alive" }
+      res[#res + 1] = { "Connection", "Keep-Alive" }
     end
 
-    write {
-      code = 200,
-      headers = headers
-    }
+    write(res)
     -- print("Writing body")
     write(body)
 
diff --git a/tests/test-http-codec.lua b/tests/test-http-codec.lua
@@ -44,10 +44,9 @@ require('tap')(function (test)
     assert(req.method == "GET")
     assert(req.path == "/path")
     assert(req.version == 1.1)
-    local headers = req.headers
-    assert(#headers == 1)
-    assert(headers[1][1] == "User-Agent")
-    assert(headers[1][2] == "Luvit-Test")
+    assert(#req == 1)
+    assert(req[1][1] == "User-Agent")
+    assert(req[1][2] == "Luvit-Test")
   end)
 
   test("http client parser", function ()
@@ -61,10 +60,9 @@ require('tap')(function (test)
     assert(res.code == 200)
     assert(res.reason == "OK")
     assert(res.version == 1.0)
-    local headers = res.headers
-    assert(#headers == 1)
-    assert(headers[1][1] == "User-Agent")
-    assert(headers[1][2] == "Luvit-Test")
+    assert(#res == 1)
+    assert(res[1][1] == "User-Agent")
+    assert(res[1][2] == "Luvit-Test")
   end)
 
   test("http 1.0 Keep-Alive", function ()
@@ -158,9 +156,9 @@ require('tap')(function (test)
 
   test("server encoder - Keepalive", function ()
     local output = testCodec(codec.server.encoder, {
-      { code = 200, headers = {
+      { code = 200,
         {"Content-Length", 12}
-      }},
+      },
       "Hello World\n",
       { code = 304 },
     })
@@ -173,9 +171,9 @@ require('tap')(function (test)
 
   test("server encoder - Chunked Encoding", function ()
     local output = testCodec(codec.server.encoder, {
-      { code = 200, headers = {
+      { code = 200,
         {"Transfer-Encoding", "chunked"}
-      }},
+      },
       "Hello World\n",
       "Another Chunk",
       false,
@@ -192,18 +190,18 @@ require('tap')(function (test)
 
   test("client encoder", function ()
     local output = testCodec(codec.client.encoder, {
-      { method = "GET", path = "/my-resource", headers = {
+      { method = "GET", path = "/my-resource",
         {"Accept", "*/*"}
-      }},
-      { method = "GET", path = "/favicon.ico", headers = {
+      },
+      { method = "GET", path = "/favicon.ico",
         {"Accept", "*/*"}
-      }},
-      { method = "GET", path = "/orgs/luvit", headers = {
+      },
+      { method = "GET", path = "/orgs/luvit",
         {"User-Agent", "Luvit Unit Tests"},
         {"Host", "api.github.com"},
         {"Accept", "*/*"},
         {"Authorization", "token 6d2fc6ae08215d69d693f5ca76ea87c7780a4275"},
-      }}
+      }
     })
     p(output)
   end)
