Mercurial > prosody-hg

comparison net/http.lua @ 7798:74cfec1fe5a2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 01 Jan 2017 19:35:06 +0100
parents 3c40b972260e 4f1b5596250b
children 1bf47706aefb
comparison
equal deleted inserted replaced
7797:d0c32d86724f 7798:74cfec1fe5a2
15 15
16 local server = require "net.server" 16 local server = require "net.server"
17 17
18 local t_insert, t_concat = table.insert, table.concat; 18 local t_insert, t_concat = table.insert, table.concat;
19 local pairs = pairs; 19 local pairs = pairs;
20 local tonumber, tostring, xpcall, select, traceback = 20 local tonumber, tostring, xpcall, traceback =
21 tonumber, tostring, xpcall, select, debug.traceback; 21 tonumber, tostring, xpcall, debug.traceback;
22 local assert, error = assert, error 22 local error = error
23 23
24 local log = require "util.logger".init("http"); 24 local log = require "util.logger".init("http");
25 25
26 local _ENV = nil; 26 local _ENV = nil;
27 27
207 return req; 207 return req;
208 end 208 end
209 209
210 return { 210 return {
211 request = request; 211 request = request;
212 212
213 -- COMPAT 213 -- COMPAT
214 urlencode = util_http.urlencode; 214 urlencode = util_http.urlencode;
215 urldecode = util_http.urldecode; 215 urldecode = util_http.urldecode;
216 formencode = util_http.formencode; 216 formencode = util_http.formencode;
217 formdecode = util_http.formdecode; 217 formdecode = util_http.formdecode;