diff options
author | Matthew Wild <mwild1@gmail.com> | 2011-04-05 13:26:43 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2011-04-05 13:26:43 +0100 |
commit | 8c9d841c3d81694d063bd931dbfee0634f53e8f7 (patch) | |
tree | 35cdd4996c2ba4c67a4805bd01e3830d1dc171f5 /net | |
parent | 54a5982b5d000a98726601dada57050ac5cb21b4 (diff) | |
parent | ca74173a8221e9cd93db30c7bb89c8b181f8b60b (diff) | |
download | prosody-8c9d841c3d81694d063bd931dbfee0634f53e8f7.tar.gz prosody-8c9d841c3d81694d063bd931dbfee0634f53e8f7.zip |
Merge 0.8->trunk
Diffstat (limited to 'net')
-rw-r--r-- | net/httpserver.lua | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/httpserver.lua b/net/httpserver.lua index e0fd3f86..74f61c56 100644 --- a/net/httpserver.lua +++ b/net/httpserver.lua @@ -136,7 +136,6 @@ local function request_reader(request, data, startpos) call_callback(request); end local function error_cb(r) - log("error", "Error in HTTP server handler: %s", r or "connection-closed"); call_callback(request, r or "connection-closed"); destroy_request(request); end |