sessionmanager, s2smanager: Destroyed sessions are now simply resting (not dead)...

[prosody.git] / net / httpserver.lua
diff --git a/net/httpserver.lua b/net/httpserver.lua

index addbfac09a7469d3bd2803e5cd5e3a5dd39b1f65..79705e6f5920234fcc4db87f89241b01fe855acc 100644 (file)
--- a/net/httpserver.lua
+++ b/net/httpserver.lua
@@ -207,15 +207,15 @@ end
  -- The default handler for requests
  default_handler = function (method, body, request)
         log("debug", method.." request for "..tostring(request.path) .. " on port "..request.handler:serverport());
-       return { status = "404 Not Found", 
+       return { status = "404 Not Found",
                         headers = { ["Content-Type"] = "text/html" },
                         body = "<html><head><title>Page Not Found</title></head><body>Not here :(</body></html>" };
  end
  
  
  function new_request(handler)
-       return { handler = handler, conn = handler.socket, 
-                       write = function (...) return handler:write(...); end, state = "request", 
+       return { handler = handler, conn = handler,
+                       write = function (...) return handler:write(...); end, state = "request",
                         server = http_servers[handler:serverport()],
                         send = send_response,
                         destroy = destroy_request,
@@ -236,7 +236,7 @@ function destroy_request(request)
                 end
                 request.handler:close()
                 if request.conn then
-                       listener.ondisconnect(request.handler, "closed");
+                       listener.ondisconnect(request.conn, "closed");
                 end
         end
  end