aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-01-01 19:35:06 +0100
committerKim Alvefur <zash@zash.se>2017-01-01 19:35:06 +0100
commit1406be3c9edc616c70e59812b73e9f07ed3da277 (patch)
tree19c3382d3adb222db99ead928209f44f522460bb
parentcced8730558fbc331ab1b7c8f1574b34c625d761 (diff)
parent6d2a83e0775e3c1a18fd7997c92b077f712e2a32 (diff)
downloadprosody-1406be3c9edc616c70e59812b73e9f07ed3da277.tar.gz
prosody-1406be3c9edc616c70e59812b73e9f07ed3da277.zip
Merge 0.10->trunk
-rw-r--r--net/http.lua8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/http.lua b/net/http.lua
index 5c1f2058..dcf94bdd 100644
--- a/net/http.lua
+++ b/net/http.lua
@@ -17,9 +17,9 @@ local server = require "net.server"
local t_insert, t_concat = table.insert, table.concat;
local pairs = pairs;
-local tonumber, tostring, xpcall, select, traceback =
- tonumber, tostring, xpcall, select, debug.traceback;
-local assert, error = assert, error
+local tonumber, tostring, xpcall, traceback =
+ tonumber, tostring, xpcall, debug.traceback;
+local error = error
local log = require "util.logger".init("http");
@@ -209,7 +209,7 @@ end
return {
request = request;
-
+
-- COMPAT
urlencode = util_http.urlencode;
urldecode = util_http.urldecode;