Merge pull request #45 from dualface/improved_luasocket_and_quick

improve luasocket and quick C++ support

Author: minggo

lua/luasocket/luasocket_scripts.c

@@ -0,0 +1,32 @@
+
+/* luasocket_scripts.h.h */
+
+#ifndef __LUA_MODULES_7381EB5AEEAEA2DF0F25EF8827143F4A_H_
+#define __LUA_MODULES_7381EB5AEEAEA2DF0F25EF8827143F4A_H_
+
+#if __cplusplus
+extern "C" {
+#endif
+
+#include "lua.h"
+
+void luaopen_luasocket_scripts(lua_State* L);
+
+/*
+int luaopen_lua_m_ltn12(lua_State* L);
+int luaopen_lua_m_mime(lua_State* L);
+int luaopen_lua_m_socket_ftp(lua_State* L);
+int luaopen_lua_m_socket_headers(lua_State* L);
+int luaopen_lua_m_socket_http(lua_State* L);
+int luaopen_lua_m_socket_mbox(lua_State* L);
+int luaopen_lua_m_socket_smtp(lua_State* L);
+int luaopen_lua_m_socket_tp(lua_State* L);
+int luaopen_lua_m_socket_url(lua_State* L);
+int luaopen_lua_m_socket(lua_State* L);
+*/
+
+#if __cplusplus
+}
+#endif
+
+#endif /* __LUA_MODULES_7381EB5AEEAEA2DF0F25EF8827143F4A_H_ */

lua/luasocket/luasocket_scripts.h

@@ -11,7 +11,7 @@ local base = _G
 local table = require("table")
 local string = require("string")
 local math = require("math")
-local socket = require("socket")
+local socket = require("socket.socket")
 local url = require("socket.url")
 local tp = require("socket.tp")
 local ltn12 = require("ltn12")
@@ -282,4 +282,4 @@ _M.get = socket.protect(function(gett)
     else return tget(gett) end
 end)
 
-return _M
+return _M

lua/luasocket/ltn12.lua renamed to lua/luasocket/script/ltn12.lua

@@ -3,7 +3,7 @@
 -- LuaSocket toolkit.
 -- Author: Diego Nehab
 -----------------------------------------------------------------------------
-local socket = require("socket")
+local socket = require("socket.socket")
 socket.headers = {}
 local _M = socket.headers
 
@@ -101,4 +101,4 @@ _M.canonic = {
     ["x-mailer"] = "X-Mailer",
 }
 
-return _M
+return _M

lua/luasocket/mime.lua renamed to lua/luasocket/script/mime.lua

@@ -7,10 +7,10 @@
 -----------------------------------------------------------------------------
 -- Declare module and import dependencies
 -------------------------------------------------------------------------------
-local socket = require("socket")
+local socket = require("socket.socket")
 local url = require("socket.url")
-local ltn12 = require("ltn12")
-local mime = require("mime")
+local ltn12 = require("socket.ltn12")
+local mime = require("socket.mime")
 local string = require("string")
 local headers = require("socket.headers")
 local base = _G
@@ -217,7 +217,7 @@ local function adjustheaders(reqt)
     }
     -- if we have authentication information, pass it along
     if reqt.user and reqt.password then
-        lower["authorization"] = 
+        lower["authorization"] =
             "Basic " ..  (mime.b64(reqt.user .. ":" .. reqt.password))
     end
     -- override with user headers
@@ -241,7 +241,7 @@ local function adjustrequest(reqt)
     -- explicit components override url
     for i,v in base.pairs(reqt) do nreqt[i] = v end
     if nreqt.port == "" then nreqt.port = 80 end
-    socket.try(nreqt.host and nreqt.host ~= "", 
+    socket.try(nreqt.host and nreqt.host ~= "",
         "invalid host '" .. base.tostring(nreqt.host) .. "'")
     -- compute uri if user hasn't overriden
     nreqt.uri = reqt.uri or adjusturi(nreqt)
@@ -279,10 +279,10 @@ local trequest, tredirect
         source = reqt.source,
         sink = reqt.sink,
         headers = reqt.headers,
-        proxy = reqt.proxy, 
+        proxy = reqt.proxy,
         nredirects = (reqt.nredirects or 0) + 1,
         create = reqt.create
-    }   
+    }
     -- pass location header back as a hint we redirected
     headers = headers or {}
     headers.location = headers.location or location
@@ -299,7 +299,7 @@ end
     h:sendheaders(nreqt.headers)
     -- if there is a body, send it
     if nreqt.source then
-        h:sendbody(nreqt.headers, nreqt.source, nreqt.step) 
+        h:sendbody(nreqt.headers, nreqt.source, nreqt.step)
     end
     local code, status = h:receivestatusline()
     -- if it is an HTTP/0.9 server, simply get the body and we are done
@@ -309,13 +309,13 @@ end
     end
     local headers
     -- ignore any 100-continue messages
-    while code == 100 do 
+    while code == 100 do
         headers = h:receiveheaders()
         code, status = h:receivestatusline()
     end
     headers = h:receiveheaders()
     -- at this point we should have a honest reply from the server
-    -- we can't redirect if we already used the source, so we report the error 
+    -- we can't redirect if we already used the source, so we report the error
     if shouldredirect(nreqt, code, headers) and not nreqt.source then
         h:close()
         return tredirect(reqt, headers.location)
@@ -351,4 +351,4 @@ _M.request = socket.protect(function(reqt, body)
     else return trequest(reqt) end
 end)
 
-return _M
+return _M

lua/luasocket/socket.lua renamed to lua/luasocket/script/socket.lua

@@ -12,11 +12,11 @@ local coroutine = require("coroutine")
 local string = require("string")
 local math = require("math")
 local os = require("os")
-local socket = require("socket")
+local socket = require("socket.socket")
 local tp = require("socket.tp")
-local ltn12 = require("ltn12")
+local ltn12 = require("socket.ltn12")
 local headers = require("socket.headers")
-local mime = require("mime")
+local mime = require("socket.mime")
 
 socket.smtp = {}
 local _M = socket.smtp
@@ -253,4 +253,4 @@ _M.send = socket.protect(function(mailt)
     return s:close()
 end)
 
-return _M
+return _M