Almost ready to release beta3

9 files changed, 19 insertions, 21 deletions

diff --git a/src/ftp.lua b/src/ftp.lua
index c55ec4e..9b7c1e5 100644
--- a/src/ftp.lua
+++ b/src/ftp.lua
@@ -278,4 +278,4 @@ get = socket.protect(function(gett)
     else return tget(gett) end
 end)
 
-getmetatable(_M).__index = nil
+--getmetatable(_M).__index = nil
diff --git a/src/http.lua b/src/http.lua
index 27ce960..5fb59ce 100644
--- a/src/http.lua
+++ b/src/http.lua
@@ -259,4 +259,4 @@ request = socket.protect(function(reqt, body)
     else return trequest(reqt) end
 end)
 
-getmetatable(_M).__index = nil
+--getmetatable(_M).__index = nil
diff --git a/src/ltn12.lua b/src/ltn12.lua
index 813e7d6..8c80196 100644
--- a/src/ltn12.lua
+++ b/src/ltn12.lua
@@ -170,20 +170,16 @@ end
 
 -- creates a source that produces contents of several sources, one after the
 -- other, as if they were concatenated
+-- (thanks to Wim Couwenberg)
 function source.cat(...)
-    local co = coroutine.create(function()
-        local i = 1
-        while i <= table.getn(arg) do
-            local chunk, err = arg[i]()
-            if chunk then coroutine.yield(chunk)
-            elseif err then return nil, err 
-            else i = i + 1 end 
-        end
-    end)
+    local src = table.remove(arg, 1)
     return function()
-        local ret, a, b  = coroutine.resume(co)
-        if ret then return a, b
-        else return nil, a end
+        while src do
+            local chunk, err = src()
+            if chunk then return chunk end
+            if err then return nil, err end
+            src = table.remove(arg, 1)
+        end
     end
 end
 
@@ -276,4 +272,4 @@ function pump.all(src, snk, step)
     end
 end
 
-getmetatable(_M).__index = nil
+--getmetatable(_M).__index = nil
diff --git a/src/luasocket.h b/src/luasocket.h
index 33524e3..db54a18 100644
--- a/src/luasocket.h
+++ b/src/luasocket.h
@@ -13,7 +13,9 @@
 /*-------------------------------------------------------------------------*\
 * Current luasocket version
 \*-------------------------------------------------------------------------*/
-#define LUASOCKET_VERSION "LuaSocket 2.0 (beta3)"
+#define LUASOCKET_VERSION    "LuaSocket 2.0 (beta3)"
+#define LUASOCKET_COPYRIGHT  "Copyright (C) 2004-2005 Diego Nehab"
+#define LUASOCKET_AUTHORS    "Diego Nehab"
 
 /*-------------------------------------------------------------------------*\
 * This macro prefixes all exported API functions
diff --git a/src/mime.lua b/src/mime.lua
index 71efdb3..4d5bdba 100644
--- a/src/mime.lua
+++ b/src/mime.lua
@@ -85,4 +85,4 @@ function mime.stuff()
     return ltn12.filter.cycle(dot, 2)
 end
 
-getmetatable(_M).__index = nil
+--getmetatable(_M).__index = nil
diff --git a/src/smtp.lua b/src/smtp.lua
index 6281544..12c2195 100644
--- a/src/smtp.lua
+++ b/src/smtp.lua
@@ -245,4 +245,4 @@ send = socket.protect(function(mailt)
     return s:close()
 end)
 
-getmetatable(_M).__index = nil
+--getmetatable(_M).__index = nil
diff --git a/src/socket.lua b/src/socket.lua
index 57619fa..e3c85f0 100644
--- a/src/socket.lua
+++ b/src/socket.lua
@@ -172,4 +172,4 @@ socket.sourcet["default"] = socket.sourcet["until-closed"]
 
 socket.source = socket.choose(socket.sourcet)
 
-getmetatable(_M).__index = nil
+--getmetatable(_M).__index = nil
diff --git a/src/tp.lua b/src/tp.lua
index 085cc2b..1adc656 100644
--- a/src/tp.lua
+++ b/src/tp.lua
@@ -120,4 +120,4 @@ function connect(host, port, timeout)
     return base.setmetatable({c = c}, metat)
 end
 
-getmetatable(_M).__index = nil
+--getmetatable(_M).__index = nil
diff --git a/src/url.lua b/src/url.lua
index e6132f8..8d7b88f 100644
--- a/src/url.lua
+++ b/src/url.lua
@@ -273,4 +273,4 @@ function build_path(parsed, unsafe)
         return path
 end
 
-getmetatable(_M).__index = nil
+--getmetatable(_M).__index = nil