Merge pull request #144 from Tieske/fix/laulin

fix error thrown, and example comments

example/app_stream.lua

@@ -12,13 +12,12 @@ local function sleep(sec)
 end
 
 server:start(function(req, res)
-   res:write('a', true)
-   sleep(3)
-   res:write('b', true)
-   sleep(3)
-   res:write('c', true)
-   res:close()
+  res:write('a', true)
+  sleep(3)
+  res:write('b', true)
+  sleep(3)
+  res:write('c', true)
 
-   -- true means the callback run without error, else false or nil
-  return true
+  -- return a truthy value to indicate the request was handled, no further handling needed
+  return res:close()
 end)

example/querystring.lua

@@ -17,6 +17,6 @@ server:start(function (req, res)
   printTable(req['querystring'])
   res:addHeader('Content-Type', 'text/html'):write('hello pegasus world!')
 
-  -- true means the callback run without error, else false or nil
-  return true
+  -- return a truthy value to indicate the request was handled, no further handling needed
+  return res:close()
 end)

example/write.lua

@@ -8,6 +8,6 @@ local server = Pegasus:new()
 server:start(function (req, res)
   res:addHeader('Content-Type', 'text/html'):write('hello pegasus world!')
 
-  -- true means the callback run without error, else false or nil
-  return true
+  -- return a truthy value to indicate the request was handled, no further handling needed
+  return res:close()
 end)

src/pegasus/handler.lua

@@ -139,7 +139,9 @@ function Handler:processRequest(port, client, server)
     end
   end
 
-  response:writeDefaultErrorMessage(404)
+  if not response.closed then
+    pcall(response.writeDefaultErrorMessage, response, 404)
+  end
 end
 
 

src/pegasus/response.lua

@@ -159,18 +159,20 @@ function Response:writeDefaultErrorMessage(statusCode, errMessage)
 end
 
 function Response:close()
-  local body = self._writeHandler:processBodyData(nil, true, self)
+  if not self.closed then
+    local body = self._writeHandler:processBodyData(nil, true, self)
 
-  if not self._skipBody then
-    if body and #body > 0 then
-      self._client:send(toHex(#body) .. '\r\n' .. body .. '\r\n')
+    if not self._skipBody then
+      if body and #body > 0 then
+        self._client:send(toHex(#body) .. '\r\n' .. body .. '\r\n')
+      end
+
+      self._client:send('0\r\n\r\n')
     end
 
-    self._client:send('0\r\n\r\n')
+    self.closed = true
   end
 
-  self.close = true  -- TODO: this seems unused??
-
   return self
 end