Commit Graph

512 Commits

Author SHA1 Message Date
Diego Nehab
9ddfe92820 Fix path for rockspec in travis file. 2013-06-13 16:40:14 +08:00
Diego Nehab
c07ad19ca1 Merging moteus suggestions for rockspec and travis 2013-06-13 16:19:03 +08:00
Diego Nehab
7cad902bb7 Fix makefile and test_socket_error.lua 2013-06-12 21:45:15 +08:00
Diego Nehab
b34386ca5c Merge pull request #58 from mascarenhas/master
New rockspec that uses LuaRocks to build instead of the makefile
2013-06-12 06:38:37 -07:00
Fabio Mascarenhas
cce138c8e5 new rockspec using builtin build type 2013-06-11 17:23:50 -03:00
Diego Nehab
6e00ffd62f Changing from 2.1-rc1 to 3.0-rc1. 2013-06-11 19:10:03 +08:00
Diego Nehab
906abf29d1 Fix unix export marker. 2013-06-11 17:20:27 +08:00
Diego Nehab
bc709ac7b7 Export global table only if "module()" is defined. 2013-06-05 18:36:51 +08:00
Diego Nehab
b1d1e721d1 No need for inet_pton. 2013-06-04 16:26:49 +08:00
Diego Nehab
802567b7de Merge pull request #49 from moteus/moteus-ftp-get-2xx
Fix. recive 2xx while ftp.get cause timeout error
2013-05-30 03:02:33 -07:00
Diego Nehab
ebde49944b Unix domain tests still broken. 2013-05-30 17:59:28 +08:00
unknown
5eefc73b57 Remove warnings. Move windows specific code. 2013-05-30 16:50:28 +08:00
Diego Nehab
a233e27865 Leaving if in src/ but out of build for now. 2013-05-30 16:20:34 +08:00
moteus
00a06857c9 Fix. recive 2xx while ftp.get cause timeout error
In this example:
>Client send: MDTM test.txt
>Server response: 213 20120824120909
Because FTP server do not open new channel (2XX response)
and LuaSocket try open new channel we get timeout.

```lua
local ftp   = require "socket.ftp"
local ltn12 = require "ltn12"
local url   = require("socket.url")

local URL = "ftp://USER:TEST@127.0.0.1";
local CMD = 'MDTM test.txt';

-- get timeout
ftp.get{
  url = URL;
  command = CMD;
  sink = ltn12.sink.table{};
}

-- or we can use ftp.command
ftp.command{
  url = URL;
  command = URL,
  check = function(...)
    local status, data = ...
    return true
  end;
}
```
2013-05-30 11:01:07 +04:00
Diego Nehab
5341131cd0 Merge pull request #43 from moteus/moteus-getopt-error
Add. Allow get `error` option to socket.
2013-05-29 04:20:33 -07:00
moteus
1de617e355 Add. Allow get error option to socket. 2013-05-29 14:33:27 +04:00
unknown
b84a5f3d08 Change VC12 project to no LUA_COMPAT_MODUULE 2013-05-29 17:19:24 +08:00
Diego Nehab
79e6c4915d Export global only if LUA_COMPAT_MODULE defined. 2013-05-29 16:56:56 +08:00
moteus
5167ddaf49 Merge branch 'unstable' of git://github.com/diegonehab/luasocket into moteus-lua52 2013-05-28 14:06:18 +04:00
unknown
2d51d61688 Fix "final" bug in pton and TCP connreset handling 2013-05-28 17:27:06 +08:00
Diego Nehab
27fd725c6d Typo fixed. 2013-05-28 01:54:49 +08:00
unknown
734cc23e1f Fixed inet_pton and a new Winsock UDP bug.
inet_pton was copying the entire sockaddr_in struct,
rather than just the sin_addr field...

I am a bit unsure about the UDP fix, because it may affect
TCP as well. On UDP sockets, when a sendto fails, the next
receive/receivefrom fails with CONNRESET. I changed
sock_recv/sock_recvfrom in wsocket.c to skip the CONNRESET
from the recv/recvfrom, hoping that if the socket is TCP,
sock_waitfd will get the CONNRESET again. The tests pass,
but this should be tested more thoroughly.
2013-05-28 00:09:30 +08:00
unknown
66cd8cfcee Fix wrong usage of inet_pton. 2013-05-27 22:17:51 +08:00
unknown
056d7653f3 Link only against ws2_32.lib. 2013-05-27 21:58:41 +08:00
Diego Nehab
3d61b0fe36 Merge branch 'pkulchenko' into unstable 2013-05-27 21:17:00 +08:00
Diego Nehab
834a3cf520 Simplifying getaddrinfo treatment. 2013-05-27 21:05:48 +08:00
unknown
5e0b56b8d3 Merge branch 'moteus' of https://github.com/moteus/luasocket into moteus 2013-05-27 20:32:54 +08:00
unknown
26704061a4 Fix Visual Studio 2012 projects 2013-05-27 20:30:06 +08:00
moteus
45ff0e1775 Fix. use table.unpack in mimetest on Lua 5.2. 2013-05-27 13:11:07 +04:00
moteus
920bc97629 Build with Lua 5.2 without LUA_COMPAT_MODULE flag.
LUASOCKET_USE_GLOBAL flag enable create global variables when load socket/mime modules.
2013-05-27 12:45:09 +04:00
moteus
bd51d8c1a5 Fix. Optional IPv6 test 2013-05-27 11:26:35 +04:00
moteus
e54f78c61c Fix. setsockname fails with "*" as host.
Add. test_bind.lua
2013-05-27 11:25:31 +04:00
moteus
56dbda39ed Fix. getaddrinfo returns garbage as address on Windows.
Add. test_getaddrinfo.lua
2013-05-27 11:20:52 +04:00
Diego Nehab
fbe184f28a No need for build script: makefile target instead. 2013-05-26 21:27:18 +08:00
Diego Nehab
427220c7b1 Merge tryconnect6 into inet_tryconnect. 2013-05-26 21:26:26 +08:00
Diego Nehab
6d93fd7c8f Fix socket.connect
Previous implementation was not making sure the socket
had the same family as the addr returned by getaddrinfo.
So instead of "connection refused", we could get "invalid
argument", which was our fault.
2013-05-26 15:18:13 +08:00
Diego Nehab
22107bb9fc Check linux build. 2013-05-25 07:25:02 -03:00
Diego Nehab
5d3a78b4a6 Added my test command lines. 2013-05-25 18:10:46 +08:00
unknown
bb0b31301a Add MingW support. 2013-05-25 18:07:38 +08:00
Diego Nehab
afe0494318 Change Mac OS Lua directory 2013-05-25 15:26:12 +08:00
unknown
cbc77440c8 Merge branch 'lua52-mingw' of https://github.com/pkulchenko/luasocket into pkulchenko 2013-05-24 18:33:43 +08:00
Diego Nehab
ca48baf495 Merge pull request #37 from davidm/unstable
lpr.lua: fix invalid string escape sequence \?
2013-04-17 20:55:19 -07:00
David Manura
817d47df42 lpr.lua: fix invalid string escape sequence \?
Not valid in 5.2 and luajit.
2013-04-17 23:35:56 -04:00
Diego Nehab
238b217c4f Merge pull request #29 from keplerproject/94c958871919726f2954b3d3fa9a9f8ae21124e9
Rockspec for building and installing LuaSocket 2.1 with LuaRocks
2013-04-17 19:40:14 -07:00
Diego Nehab
c28fa1d309 Merge pull request #27 from catwell/pull-noarg
fix more uses of arg
2013-04-17 19:38:21 -07:00
Diego Nehab
00435529bb Merge pull request #32 from ideka/unstable
Use the length operator (#) instead of table.getn.
2013-04-17 19:13:28 -07:00
Paul Kulchenko
571308a94e Updated IPV6_V6ONLY to match header files on Windows. 2013-04-09 09:25:40 -07:00
Paul Kulchenko
5a58786a39 Added inet_pton/inet_ntop for MinGW on Windows; compiles with Lua52. 2013-04-07 12:39:56 -07:00
Gerardo Marset
56893e9dcd Use the length operator (#) instead of table.getn.
table.getn was deprecated in Lua 5.1 in favor of #, the length operator.
See: http://www.lua.org/manual/5.1/manual.html#7.2
2013-02-25 20:28:28 -02:00
Fabio Mascarenhas
94c9588719 rockspec for luasocket 2.1 unstable 2013-01-24 15:28:17 -02:00