Software / code / prosody
Changeset
7798:74cfec1fe5a2
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 01 Jan 2017 19:35:06 +0100 |
| parents | 7797:d0c32d86724f (current diff) 7793:4f1b5596250b (diff) |
| children | 7799:93643a61858a |
| files | net/http.lua |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/net/http.lua Sun Jan 01 19:34:18 2017 +0100 +++ b/net/http.lua Sun Jan 01 19:35:06 2017 +0100 @@ -17,9 +17,9 @@ 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 @@ return { request = request; - + -- COMPAT urlencode = util_http.urlencode; urldecode = util_http.urldecode;
