Commit Graph

665 Commits

Author SHA1 Message Date
Diego Nehab
699c36c019
Merge pull request #116 from linuxmaniac/master
Add "tcp-keepidle", "tcp-keepcnt" and "tcp-keepintvl" options
2019-02-24 17:55:27 -03:00
Diego Nehab
f6ba23d463
Merge pull request #259 from davidgumberg/patch-1
Make macosx.cmd generic
2019-02-24 17:54:11 -03:00
Diego Nehab
b8f088e868
Merge pull request #258 from ewestbrook/luasec117
http.lua: if default for scheme, omit port number in "Host:" header
2019-02-24 17:48:00 -03:00
Diego Nehab
c5cef32897
Merge pull request #262 from fregie/master
compile unixdgram.c, unixstream.c into unix.so
2019-02-24 17:45:58 -03:00
Diego Nehab
4b0f1d753d
Merge pull request #265 from ewestbrook/dualincpaths
src/makefile: support both lua/$(LUAV) and lua$(LUAV) include paths
2019-02-24 17:44:54 -03:00
Diego Nehab
40f79c1961
Merge pull request #266 from siffiejoe/luajit-static-linking
Fix static linking problem with LuaJIT
2019-02-24 17:42:27 -03:00
Diego Nehab
e136dd3df3
Merge pull request #267 from ewestbrook/prc-maxredirects
Allow overriding of hard-coded redirect limit
2019-02-24 17:41:10 -03:00
E. Westbrook
09ff9b650c http.lua: allow override of hard-coded 5 max redirects 2019-02-23 12:23:17 -07:00
Philipp Janda
59c8aaac34 Fix static linking problem with LuaJIT
LuaJIT and LuaSocket both define new Lua APIs from Lua 5.2 (in
particular `luaL_setfuncs` and `luaL_testudata`). When linking both
statically, the one definition rule strikes and linking fails. This
commit fixes the issue by renaming the LuaSocket versions of those
functions behind the scenes using the C preprocessor.

Closes #214
2019-02-23 10:37:16 +01:00
E. Westbrook
5858c8e776 src/makefile: support both lua/$(LUAV) and lua$(LUAV) include paths 2019-02-22 16:16:03 -07:00
E. Westbrook
686f2ce822 http.lua: if default for scheme, omit port number in "Host:" header 2019-02-20 02:42:40 -07:00
Diego Nehab
144fa01c2f
Merge pull request #264 from ewestbrook/freebsd-unix-bind-connect
src/unixdgram.c: fix connect() and bind() on FreeBSD
2019-02-19 16:08:47 -03:00
E. Westbrook
024646de54 Use SUN_LEN macro 2019-02-19 10:05:10 -07:00
Diego Nehab
57e04f55dc
Merge pull request #263 from ewestbrook/freebsd-has-sun-len
src/makefile: enable UNIX_HAS_SUN_LEN for FreeBSD builds
2019-02-19 13:26:18 -03:00
E. Westbrook
531012df1a src/unixdgram.c: allow connect() and bind() on freebsd without dummy char, and simplify calculations 2019-02-19 04:51:23 -07:00
E. Westbrook
d1e35c9573 src/makefile: define UNIX_HAS_SUN_LEN for FreeBSD builds 2019-02-19 04:02:37 -07:00
fregie
4950294c26 compile unixdgram.c, unixstream.c into unix.so 2019-01-11 16:04:34 +08:00
David Gumberg
e2bb1d3b42
Make macosx.cmd generic 2018-09-29 16:29:58 -07:00
Diego Nehab
288219fd6b Update to Visual Studio 2017. 2018-08-22 17:37:32 -03:00
Diego Nehab
648d81281f
Merge pull request #256 from ewestbrook/luasocket254
url.lua:absolute_path(): fix issue #254
2018-08-22 14:18:43 -03:00
E. Westbrook
043e997713 url.lua:remove_dot_components(): avoid ambiguous numeric representation as empty-path-segment marker 2018-08-21 12:43:30 -06:00
E. Westbrook
ca5398be09 url.lua:remove_dot_components(): use temporary NUL marker to reduce empty-segment special-case code 2018-08-21 12:17:12 -06:00
E. Westbrook
38d936ec0e url.lua:remove_dot_components(): empty path component double-dot corner case 2018-08-21 11:27:42 -06:00
E. Westbrook
5b862e6a3c url.lua:absolute_path(): ensure a separator between base_path and relative_path 2018-08-21 10:43:04 -06:00
E. Westbrook
7ccea58776 url.lua:remove_dot_components(): avoid overconsuming dot segments 2018-08-21 09:59:45 -06:00
E. Westbrook
c570a32c21 url.lua:remove_dot_components(): limit beginning-of-string double-dot corner case to prevent triple-dot activation and authority collision 2018-08-21 09:07:42 -06:00
E. Westbrook
c905b5d44f url.lua: separate remove_dot_components() from absolute_path(); also use in _M.absolute() even when not merging 2018-08-21 08:03:51 -06:00
E. Westbrook
17a95c126a url.lua:absolute_path(): fix issue #254, simplify, add more test cases 2018-08-19 11:32:42 -06:00
Diego Nehab
5813cd0505
Merge pull request #253 from flyingdutchman23/master
Fix gcc-8.1.0 warning.
2018-08-06 13:15:58 -03:00
Joris Clement
9b82c7871d Fix gcc-8.1.0 warning. 2018-08-06 15:30:13 +02:00
Diego Nehab
4df569e9f8
Merge pull request #250 from ewestbrook/testudata-compat
Update auxiliar.c to use luaL_testudata (#249), now with Lua 5.1 compatibility
2018-06-05 10:54:55 -03:00
Diego Nehab
cc42bcbf80
Merge pull request #251 from ewestbrook/ltn12tblsrc
Add ltn12.source.table()
2018-06-05 09:56:59 -03:00
E. Westbrook
8fee636309 Add ltn12.source.table() 2018-06-05 00:00:39 -06:00
E. Westbrook
5848de4851 src/compat.c: provide luaL_testudata() for use by auxiliar.c under Lua 5.1 2018-06-04 20:14:13 -06:00
George Zhao
e1e41be948
Update auxiliar.c 2018-06-03 20:08:02 +08:00
Diego Nehab
6529598909
Merge pull request #239 from ewestbrook/namebuf57
Fix buffer size error in src/options.c detected by GCC 7
2017-12-23 01:24:33 -02:00
E. Westbrook
72fb9dcb49 src/options.c: increase buffer from 45 to 57, to accommodate string sizes specified (detected by gcc7's -Wstringpop-overflow) 2017-12-22 16:57:20 -07:00
Diego Nehab
88b13a825b
Merge pull request #238 from hleuwer/master
Fix URL parsing of userinfo containing # character.
2017-11-23 13:28:25 -02:00
Herbert Leuwer
2d6a0f7bda fixed url parsing; postpone fragment parsing after authority parsing; added test cases to test/urltest.lua
fixed reference patterns in check_protect() to upper case hex letters
2017-11-22 09:30:12 +01:00
Herbert Leuwer
3ee89515a0 fixed URL parsing in url.lua: parse fragment after parsing username and password. 2017-11-19 19:48:37 +01:00
Diego Nehab
5a17f79b03 Merge pull request #213 from elliptica/master
Fix typo
2017-05-15 15:29:49 -03:00
Elliptica
aef7bcf288 Fix typo 2017-04-17 18:47:48 +03:00
Diego Nehab
ff1a447b4d Merge pull request #210 from Lord-Helmchen/patch-1
make protect_segment in url.lua rfc compliant
2017-03-20 17:01:30 -03:00
Diego Nehab
47e644031f Preserve path when parsing urls. 2017-03-20 16:56:15 -03:00
Diego Nehab
1b4debffee Fix issue #196 2017-03-20 15:50:47 -03:00
Diego Nehab
865356f6eb Merge pull request #211 from fperrad/patch-1
fix for Lua 5.3 built without number / string conversion
2017-03-20 13:58:33 -03:00
LordHelmchen
44fb9e9112 correct typo 2017-03-16 17:53:02 +01:00
François Perrad
16bb548746 fix for Lua 5.3 built without number / string conversion
This kind of Lua could be built with this command:
```
    hererocks --lua 5.3 --cflags="-DLUA_NOCVTN2S -DLUA_NOCVTS2N"
```
2017-03-16 16:57:17 +01:00
LordHelmchen
860da0f4b4 make protect_segment in url.lua rfc compliant
percent-encode uppercase
see https://tools.ietf.org/html/rfc3986#section-6.2.2
2017-03-16 16:33:28 +01:00
Diego Nehab
29e5ad610a Merge pull request #207 from cbane/unix-sockets
Add backwards compatibility wrappers for socket.unix
2017-01-25 23:25:55 -02:00