aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Nehab <diego.nehab@gmail.com>2016-02-11 11:01:57 -0200
committerDiego Nehab <diego.nehab@gmail.com>2016-02-11 11:01:57 -0200
commit280e1d68a62ebf65b4526e300813e6d805216ea7 (patch)
tree0e4bb188501594fdb274bbe88dc600558ecaed12
parent83880dbed77f9a0a3627bce2e7bfbe1b862e091d (diff)
parent91928813466cd10b1b4e6f118f2decfb3b2aba33 (diff)
downloadluasocket-280e1d68a62ebf65b4526e300813e6d805216ea7.tar.gz
luasocket-280e1d68a62ebf65b4526e300813e6d805216ea7.tar.bz2
luasocket-280e1d68a62ebf65b4526e300813e6d805216ea7.zip
Merge pull request #157 from mpeterv/ltn12-lua53
Fix error in ltn12 under Lua 5.3
-rw-r--r--src/ltn12.lua3
-rw-r--r--src/mbox.lua2
-rw-r--r--src/tp.lua2
-rw-r--r--src/url.lua1
4 files changed, 5 insertions, 3 deletions
diff --git a/src/ltn12.lua b/src/ltn12.lua
index 1014de2..dede0fa 100644
--- a/src/ltn12.lua
+++ b/src/ltn12.lua
@@ -9,6 +9,7 @@
9----------------------------------------------------------------------------- 9-----------------------------------------------------------------------------
10local string = require("string") 10local string = require("string")
11local table = require("table") 11local table = require("table")
12local unpack = unpack or table.unpack
12local base = _G 13local base = _G
13local _M = {} 14local _M = {}
14if module then -- heuristic for exporting a global package table 15if module then -- heuristic for exporting a global package table
@@ -42,7 +43,7 @@ end
42-- (thanks to Wim Couwenberg) 43-- (thanks to Wim Couwenberg)
43function filter.chain(...) 44function filter.chain(...)
44 local arg = {...} 45 local arg = {...}
45 local n = select('#',...) 46 local n = base.select('#',...)
46 local top, index = 1, 1 47 local top, index = 1, 1
47 local retry = "" 48 local retry = ""
48 return function(chunk) 49 return function(chunk)
diff --git a/src/mbox.lua b/src/mbox.lua
index 7724ae2..ed9e781 100644
--- a/src/mbox.lua
+++ b/src/mbox.lua
@@ -61,7 +61,7 @@ function _M.parse_from(from)
61end 61end
62 62
63function _M.split_mbox(mbox_s) 63function _M.split_mbox(mbox_s)
64 mbox = {} 64 local mbox = {}
65 mbox_s = string.gsub(mbox_s, "\r\n", "\n") .."\n\nFrom \n" 65 mbox_s = string.gsub(mbox_s, "\r\n", "\n") .."\n\nFrom \n"
66 local nj, i, j = 1, 1, 1 66 local nj, i, j = 1, 1, 1
67 while 1 do 67 while 1 do
diff --git a/src/tp.lua b/src/tp.lua
index cbeff56..328cbab 100644
--- a/src/tp.lua
+++ b/src/tp.lua
@@ -74,7 +74,7 @@ function metat.__index:command(cmd, arg)
74end 74end
75 75
76function metat.__index:sink(snk, pat) 76function metat.__index:sink(snk, pat)
77 local chunk, err = c:receive(pat) 77 local chunk, err = self.c:receive(pat)
78 return snk(chunk, err) 78 return snk(chunk, err)
79end 79end
80 80
diff --git a/src/url.lua b/src/url.lua
index 7809535..fbd93d1 100644
--- a/src/url.lua
+++ b/src/url.lua
@@ -219,6 +219,7 @@ end
219-- corresponding absolute url 219-- corresponding absolute url
220----------------------------------------------------------------------------- 220-----------------------------------------------------------------------------
221function _M.absolute(base_url, relative_url) 221function _M.absolute(base_url, relative_url)
222 local base_parsed
222 if base.type(base_url) == "table" then 223 if base.type(base_url) == "table" then
223 base_parsed = base_url 224 base_parsed = base_url
224 base_url = _M.build(base_parsed) 225 base_url = _M.build(base_parsed)