# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1483295706 -3600
# Node ID 74cfec1fe5a2ecaa650fe096802822996613ebae
# Parent  d0c32d86724f98acb86e9cfe5fc2e9eb06530484# Parent  4f1b5596250b234a54607f7a682faeb0fae38da1
Merge 0.10->trunk

diff -r d0c32d86724f -r 74cfec1fe5a2 net/http.lua
--- 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;