aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2011-08-31 20:25:13 -0400
committerMatthew Wild <mwild1@gmail.com>2011-08-31 20:25:13 -0400
commitb4dbdbc6e75d3ebafdb542fc803c000b514d180d (patch)
treeeed809abc6f65e575efdc46d3e5486bde1d60622
parente56f8f4b7695ccb81084a3e09f0add781f41af1d (diff)
parent6e40859dc0cac2d92ecd932ab1df1cd87d2c74f7 (diff)
downloadprosody-b4dbdbc6e75d3ebafdb542fc803c000b514d180d.tar.gz
prosody-b4dbdbc6e75d3ebafdb542fc803c000b514d180d.zip
Merge with trunk
-rw-r--r--net/httpclient_listener.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/httpclient_listener.lua b/net/httpclient_listener.lua
index 342c2311..00481afa 100644
--- a/net/httpclient_listener.lua
+++ b/net/httpclient_listener.lua
@@ -7,7 +7,7 @@
--
local log = require "util.logger".init("httpclient_listener");
-local t_concat = table.concat;
+local t_concat, t_insert = table.concat, table.insert;
local connlisteners_register = require "net.connlisteners".register;