diff options
author | Diego Nehab <diego@tecgraf.puc-rio.br> | 2005-06-14 04:29:23 +0000 |
---|---|---|
committer | Diego Nehab <diego@tecgraf.puc-rio.br> | 2005-06-14 04:29:23 +0000 |
commit | 65c35845c54c7f84b1cf5b0e3d4c7bbdaf1014e3 (patch) | |
tree | f6e3f1a31451281ac2a347c3080e9749456dac29 /src | |
parent | 8b114f3bf4ccea3b065551fa94649a9e45935b5b (diff) | |
download | luasocket-65c35845c54c7f84b1cf5b0e3d4c7bbdaf1014e3.tar.gz luasocket-65c35845c54c7f84b1cf5b0e3d4c7bbdaf1014e3.tar.bz2 luasocket-65c35845c54c7f84b1cf5b0e3d4c7bbdaf1014e3.zip |
Working on the manual.
Diffstat (limited to 'src')
-rw-r--r-- | src/ftp.lua | 2 | ||||
-rw-r--r-- | src/http.lua | 4 | ||||
-rw-r--r-- | src/inet.c | 24 | ||||
-rw-r--r-- | src/ltn12.lua | 2 | ||||
-rw-r--r-- | src/luasocket.c | 4 | ||||
-rw-r--r-- | src/mime.lua | 3 | ||||
-rw-r--r-- | src/smtp.lua | 4 | ||||
-rw-r--r-- | src/socket.lua | 3 | ||||
-rw-r--r-- | src/tp.lua | 2 | ||||
-rw-r--r-- | src/url.lua | 2 |
10 files changed, 26 insertions, 24 deletions
diff --git a/src/ftp.lua b/src/ftp.lua index a793298..841df5f 100644 --- a/src/ftp.lua +++ b/src/ftp.lua | |||
@@ -8,7 +8,7 @@ | |||
8 | ----------------------------------------------------------------------------- | 8 | ----------------------------------------------------------------------------- |
9 | -- Declare module and import dependencies | 9 | -- Declare module and import dependencies |
10 | ----------------------------------------------------------------------------- | 10 | ----------------------------------------------------------------------------- |
11 | local base = require("base") | 11 | local base = _G |
12 | local table = require("table") | 12 | local table = require("table") |
13 | local string = require("string") | 13 | local string = require("string") |
14 | local math = require("math") | 14 | local math = require("math") |
diff --git a/src/http.lua b/src/http.lua index 669f54d..1a7b101 100644 --- a/src/http.lua +++ b/src/http.lua | |||
@@ -13,7 +13,7 @@ local url = require("socket.url") | |||
13 | local ltn12 = require("ltn12") | 13 | local ltn12 = require("ltn12") |
14 | local mime = require("mime") | 14 | local mime = require("mime") |
15 | local string = require("string") | 15 | local string = require("string") |
16 | local base = require("base") | 16 | local base = _G |
17 | local table = require("table") | 17 | local table = require("table") |
18 | module("socket.http") | 18 | module("socket.http") |
19 | 19 | ||
@@ -25,7 +25,7 @@ TIMEOUT = 60 | |||
25 | -- default port for document retrieval | 25 | -- default port for document retrieval |
26 | PORT = 80 | 26 | PORT = 80 |
27 | -- user agent field sent in request | 27 | -- user agent field sent in request |
28 | USERAGENT = socket.VERSION | 28 | USERAGENT = socket._VERSION |
29 | 29 | ||
30 | ----------------------------------------------------------------------------- | 30 | ----------------------------------------------------------------------------- |
31 | -- Extra sources and sinks | 31 | -- Extra sources and sinks |
@@ -172,21 +172,25 @@ static void inet_pushresolved(lua_State *L, struct hostent *hp) | |||
172 | i = 1; | 172 | i = 1; |
173 | alias = hp->h_aliases; | 173 | alias = hp->h_aliases; |
174 | lua_newtable(L); | 174 | lua_newtable(L); |
175 | while (*alias) { | 175 | if (alias) { |
176 | lua_pushnumber(L, i); | 176 | while (*alias) { |
177 | lua_pushstring(L, *alias); | 177 | lua_pushnumber(L, i); |
178 | lua_settable(L, -3); | 178 | lua_pushstring(L, *alias); |
179 | i++; alias++; | 179 | lua_settable(L, -3); |
180 | i++; alias++; | ||
181 | } | ||
180 | } | 182 | } |
181 | lua_settable(L, resolved); | 183 | lua_settable(L, resolved); |
182 | i = 1; | 184 | i = 1; |
183 | lua_newtable(L); | 185 | lua_newtable(L); |
184 | addr = (struct in_addr **) hp->h_addr_list; | 186 | addr = (struct in_addr **) hp->h_addr_list; |
185 | while (*addr) { | 187 | if (addr) { |
186 | lua_pushnumber(L, i); | 188 | while (*addr) { |
187 | lua_pushstring(L, inet_ntoa(**addr)); | 189 | lua_pushnumber(L, i); |
188 | lua_settable(L, -3); | 190 | lua_pushstring(L, inet_ntoa(**addr)); |
189 | i++; addr++; | 191 | lua_settable(L, -3); |
192 | i++; addr++; | ||
193 | } | ||
190 | } | 194 | } |
191 | lua_settable(L, resolved); | 195 | lua_settable(L, resolved); |
192 | } | 196 | } |
diff --git a/src/ltn12.lua b/src/ltn12.lua index 1acb9b1..fbc9dce 100644 --- a/src/ltn12.lua +++ b/src/ltn12.lua | |||
@@ -10,7 +10,7 @@ | |||
10 | ----------------------------------------------------------------------------- | 10 | ----------------------------------------------------------------------------- |
11 | local string = require("string") | 11 | local string = require("string") |
12 | local table = require("table") | 12 | local table = require("table") |
13 | local base = require("base") | 13 | local base = _G |
14 | module("ltn12") | 14 | module("ltn12") |
15 | 15 | ||
16 | filter = {} | 16 | filter = {} |
diff --git a/src/luasocket.c b/src/luasocket.c index 8f13dbc..2c3b526 100644 --- a/src/luasocket.c +++ b/src/luasocket.c | |||
@@ -89,12 +89,12 @@ static int base_open(lua_State *L) { | |||
89 | /* export functions (and leave namespace table on top of stack) */ | 89 | /* export functions (and leave namespace table on top of stack) */ |
90 | luaL_openlib(L, "socket", func, 0); | 90 | luaL_openlib(L, "socket", func, 0); |
91 | #ifdef LUASOCKET_DEBUG | 91 | #ifdef LUASOCKET_DEBUG |
92 | lua_pushstring(L, "DEBUG"); | 92 | lua_pushstring(L, "_DEBUG"); |
93 | lua_pushboolean(L, 1); | 93 | lua_pushboolean(L, 1); |
94 | lua_rawset(L, -3); | 94 | lua_rawset(L, -3); |
95 | #endif | 95 | #endif |
96 | /* make version string available to scripts */ | 96 | /* make version string available to scripts */ |
97 | lua_pushstring(L, "VERSION"); | 97 | lua_pushstring(L, "_VERSION"); |
98 | lua_pushstring(L, LUASOCKET_VERSION); | 98 | lua_pushstring(L, LUASOCKET_VERSION); |
99 | lua_rawset(L, -3); | 99 | lua_rawset(L, -3); |
100 | return 1; | 100 | return 1; |
diff --git a/src/mime.lua b/src/mime.lua index 6ef82b8..f6509a0 100644 --- a/src/mime.lua +++ b/src/mime.lua | |||
@@ -8,8 +8,7 @@ | |||
8 | ----------------------------------------------------------------------------- | 8 | ----------------------------------------------------------------------------- |
9 | -- Declare module and import dependencies | 9 | -- Declare module and import dependencies |
10 | ----------------------------------------------------------------------------- | 10 | ----------------------------------------------------------------------------- |
11 | package.loaded.base = _G | 11 | local base = _G |
12 | local base = require("base") | ||
13 | local ltn12 = require("ltn12") | 12 | local ltn12 = require("ltn12") |
14 | local mime = require("cmime") | 13 | local mime = require("cmime") |
15 | module("mime") | 14 | module("mime") |
diff --git a/src/smtp.lua b/src/smtp.lua index 944a40f..6850f7f 100644 --- a/src/smtp.lua +++ b/src/smtp.lua | |||
@@ -8,7 +8,7 @@ | |||
8 | ----------------------------------------------------------------------------- | 8 | ----------------------------------------------------------------------------- |
9 | -- Declare module and import dependencies | 9 | -- Declare module and import dependencies |
10 | ----------------------------------------------------------------------------- | 10 | ----------------------------------------------------------------------------- |
11 | local base = require("base") | 11 | local base = _G |
12 | local coroutine = require("coroutine") | 12 | local coroutine = require("coroutine") |
13 | local string = require("string") | 13 | local string = require("string") |
14 | local math = require("math") | 14 | local math = require("math") |
@@ -216,7 +216,7 @@ local function adjust_headers(mesgt) | |||
216 | end | 216 | end |
217 | lower["date"] = lower["date"] or | 217 | lower["date"] = lower["date"] or |
218 | os.date("!%a, %d %b %Y %H:%M:%S ") .. (mesgt.zone or ZONE) | 218 | os.date("!%a, %d %b %Y %H:%M:%S ") .. (mesgt.zone or ZONE) |
219 | lower["x-mailer"] = lower["x-mailer"] or socket.VERSION | 219 | lower["x-mailer"] = lower["x-mailer"] or socket._VERSION |
220 | -- this can't be overriden | 220 | -- this can't be overriden |
221 | lower["mime-version"] = "1.0" | 221 | lower["mime-version"] = "1.0" |
222 | mesgt.headers = lower | 222 | mesgt.headers = lower |
diff --git a/src/socket.lua b/src/socket.lua index 9a523fe..d1c7846 100644 --- a/src/socket.lua +++ b/src/socket.lua | |||
@@ -7,8 +7,7 @@ | |||
7 | ----------------------------------------------------------------------------- | 7 | ----------------------------------------------------------------------------- |
8 | -- Declare module and import dependencies | 8 | -- Declare module and import dependencies |
9 | ----------------------------------------------------------------------------- | 9 | ----------------------------------------------------------------------------- |
10 | package.loaded.base = _G | 10 | local base = _G |
11 | local base = require("base") | ||
12 | local string = require("string") | 11 | local string = require("string") |
13 | local math = require("math") | 12 | local math = require("math") |
14 | local socket = require("csocket") | 13 | local socket = require("csocket") |
@@ -8,7 +8,7 @@ | |||
8 | ----------------------------------------------------------------------------- | 8 | ----------------------------------------------------------------------------- |
9 | -- Declare module and import dependencies | 9 | -- Declare module and import dependencies |
10 | ----------------------------------------------------------------------------- | 10 | ----------------------------------------------------------------------------- |
11 | local base = require("base") | 11 | local base = _G |
12 | local string = require("string") | 12 | local string = require("string") |
13 | local socket = require("socket") | 13 | local socket = require("socket") |
14 | local ltn12 = require("ltn12") | 14 | local ltn12 = require("ltn12") |
diff --git a/src/url.lua b/src/url.lua index f29ecc8..0db111b 100644 --- a/src/url.lua +++ b/src/url.lua | |||
@@ -9,7 +9,7 @@ | |||
9 | -- Declare module | 9 | -- Declare module |
10 | ----------------------------------------------------------------------------- | 10 | ----------------------------------------------------------------------------- |
11 | local string = require("string") | 11 | local string = require("string") |
12 | local base = require("base") | 12 | local base = _G |
13 | local table = require("table") | 13 | local table = require("table") |
14 | module("socket.url") | 14 | module("socket.url") |
15 | 15 | ||