Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #116 from linuxmaniac/master | Diego Nehab | 2019-02-24 | 5 | -1/+81 |
|\ | | | | | Add "tcp-keepidle", "tcp-keepcnt" and "tcp-keepintvl" options | ||||
| * | Add "tcp-keepidle", "tcp-keepcnt" and "tcp-keepintvl" options | Victor Seva | 2014-12-05 | 5 | -1/+81 |
| | | |||||
* | | Merge pull request #259 from davidgumberg/patch-1 | Diego Nehab | 2019-02-24 | 1 | -1/+1 |
|\ \ | | | | | | | Make macosx.cmd generic | ||||
| * | | Make macosx.cmd generic | David Gumberg | 2018-09-29 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #258 from ewestbrook/luasec117 | Diego Nehab | 2019-02-24 | 1 | -6/+14 |
|\ \ \ | | | | | | | | | http.lua: if default for scheme, omit port number in "Host:" header | ||||
| * | | | http.lua: if default for scheme, omit port number in "Host:" header | E. Westbrook | 2019-02-20 | 1 | -6/+14 |
| | | | | |||||
* | | | | Merge pull request #262 from fregie/master | Diego Nehab | 2019-02-24 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | compile unixdgram.c, unixstream.c into unix.so | ||||
| * | | | | compile unixdgram.c, unixstream.c into unix.so | fregie | 2019-01-11 | 1 | -1/+1 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #265 from ewestbrook/dualincpaths | Diego Nehab | 2019-02-24 | 1 | -12/+12 |
|\ \ \ \ | | | | | | | | | | | src/makefile: support both lua/$(LUAV) and lua$(LUAV) include paths | ||||
| * | | | | src/makefile: support both lua/$(LUAV) and lua$(LUAV) include paths | E. Westbrook | 2019-02-22 | 1 | -12/+12 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #266 from siffiejoe/luajit-static-linking | Diego Nehab | 2019-02-24 | 1 | -0/+2 |
|\ \ \ \ | | | | | | | | | | | Fix static linking problem with LuaJIT | ||||
| * | | | | Fix static linking problem with LuaJIT | Philipp Janda | 2019-02-23 | 1 | -0/+2 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | | | | Merge pull request #267 from ewestbrook/prc-maxredirects | Diego Nehab | 2019-02-24 | 2 | -4/+9 |
|\ \ \ \ | |/ / / |/| | | | Allow overriding of hard-coded redirect limit | ||||
| * | | | http.lua: allow override of hard-coded 5 max redirects | E. Westbrook | 2019-02-23 | 2 | -4/+9 |
|/ / / | |||||
* | | | Merge pull request #264 from ewestbrook/freebsd-unix-bind-connect | Diego Nehab | 2019-02-19 | 1 | -15/+12 |
|\ \ \ | | | | | | | | | src/unixdgram.c: fix connect() and bind() on FreeBSD | ||||
| * | | | Use SUN_LEN macro | E. Westbrook | 2019-02-19 | 1 | -2/+8 |
| | | | | |||||
| * | | | src/unixdgram.c: allow connect() and bind() on freebsd without dummy char, ↵ | E. Westbrook | 2019-02-19 | 1 | -15/+6 |
| |/ / | | | | | | | | | | and simplify calculations | ||||
* | | | Merge pull request #263 from ewestbrook/freebsd-has-sun-len | Diego Nehab | 2019-02-19 | 1 | -2/+2 |
|\ \ \ | |/ / |/| | | src/makefile: enable UNIX_HAS_SUN_LEN for FreeBSD builds | ||||
| * | | src/makefile: define UNIX_HAS_SUN_LEN for FreeBSD builds | E. Westbrook | 2019-02-19 | 1 | -2/+2 |
|/ / | |||||
* | | Update to Visual Studio 2017. | Diego Nehab | 2018-08-22 | 10 | -178/+151 |
| | | |||||
* | | Merge pull request #256 from ewestbrook/luasocket254 | Diego Nehab | 2018-08-22 | 2 | -26/+82 |
|\ \ | | | | | | | url.lua:absolute_path(): fix issue #254 | ||||
| * | | url.lua:remove_dot_components(): avoid ambiguous numeric representation as ↵ | E. Westbrook | 2018-08-21 | 1 | -2/+3 |
| | | | | | | | | | | | | empty-path-segment marker | ||||
| * | | url.lua:remove_dot_components(): use temporary NUL marker to reduce ↵ | E. Westbrook | 2018-08-21 | 2 | -2/+7 |
| | | | | | | | | | | | | empty-segment special-case code | ||||
| * | | url.lua:remove_dot_components(): empty path component double-dot corner case | E. Westbrook | 2018-08-21 | 2 | -0/+5 |
| | | | |||||
| * | | url.lua:absolute_path(): ensure a separator between base_path and relative_path | E. Westbrook | 2018-08-21 | 2 | -1/+2 |
| | | | |||||
| * | | url.lua:remove_dot_components(): avoid overconsuming dot segments | E. Westbrook | 2018-08-21 | 2 | -2/+7 |
| | | | |||||
| * | | url.lua:remove_dot_components(): limit beginning-of-string double-dot corner ↵ | E. Westbrook | 2018-08-21 | 2 | -1/+2 |
| | | | | | | | | | | | | case to prevent triple-dot activation and authority collision | ||||
| * | | url.lua: separate remove_dot_components() from absolute_path(); also use in ↵ | E. Westbrook | 2018-08-21 | 2 | -21/+38 |
| | | | | | | | | | | | | _M.absolute() even when not merging | ||||
| * | | url.lua:absolute_path(): fix issue #254, simplify, add more test cases | E. Westbrook | 2018-08-19 | 2 | -15/+36 |
|/ / | |||||
* | | Merge pull request #253 from flyingdutchman23/master | Diego Nehab | 2018-08-06 | 1 | -0/+1 |
|\ \ | | | | | | | Fix gcc-8.1.0 warning. | ||||
| * | | Fix gcc-8.1.0 warning. | Joris Clement | 2018-08-06 | 1 | -0/+1 |
|/ / | |||||
* | | Merge pull request #250 from ewestbrook/testudata-compat | Diego Nehab | 2018-06-05 | 3 | -1/+20 |
|\ \ | | | | | | | Update auxiliar.c to use luaL_testudata (#249), now with Lua 5.1 compatibility | ||||
| * | | src/compat.c: provide luaL_testudata() for use by auxiliar.c under Lua 5.1 | E. Westbrook | 2018-06-04 | 2 | -0/+19 |
| | | | |||||
| * | | Update auxiliar.c | George Zhao | 2018-06-03 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #251 from ewestbrook/ltn12tblsrc | Diego Nehab | 2018-06-05 | 4 | -1/+31 |
|\ \ \ | |/ / |/| | | Add ltn12.source.table() | ||||
| * | | Add ltn12.source.table() | E. Westbrook | 2018-06-05 | 4 | -1/+31 |
|/ / | |||||
* | | Merge pull request #239 from ewestbrook/namebuf57 | Diego Nehab | 2017-12-23 | 1 | -2/+2 |
|\ \ | | | | | | | Fix buffer size error in src/options.c detected by GCC 7 | ||||
| * | | src/options.c: increase buffer from 45 to 57, to accommodate string sizes ↵ | E. Westbrook | 2017-12-22 | 1 | -2/+2 |
|/ / | | | | | | | specified (detected by gcc7's -Wstringpop-overflow) | ||||
* | | Merge pull request #238 from hleuwer/master | Diego Nehab | 2017-11-23 | 2 | -8/+77 |
|\ \ | | | | | | | Fix URL parsing of userinfo containing # character. | ||||
| * | | fixed url parsing; postpone fragment parsing after authority parsing; added ↵ | Herbert Leuwer | 2017-11-22 | 2 | -8/+77 |
| | | | | | | | | | | | | | | | | | | test cases to test/urltest.lua fixed reference patterns in check_protect() to upper case hex letters | ||||
| * | | fixed URL parsing in url.lua: parse fragment after parsing username and ↵ | Herbert Leuwer | 2017-11-19 | 1 | -5/+5 |
|/ / | | | | | | | password. | ||||
* | | Merge pull request #213 from elliptica/master | Diego Nehab | 2017-05-15 | 1 | -1/+1 |
|\ \ | | | | | | | Fix typo | ||||
| * | | Fix typo | Elliptica | 2017-04-17 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #210 from Lord-Helmchen/patch-1 | Diego Nehab | 2017-03-20 | 1 | -2/+2 |
|\ \ | | | | | | | make protect_segment in url.lua rfc compliant | ||||
| * | | correct typo | LordHelmchen | 2017-03-16 | 1 | -1/+1 |
| | | | |||||
| * | | make protect_segment in url.lua rfc compliant | LordHelmchen | 2017-03-16 | 1 | -1/+1 |
| | | | | | | | | | | | | percent-encode uppercase see https://tools.ietf.org/html/rfc3986#section-6.2.2 | ||||
* | | | Preserve path when parsing urls. | Diego Nehab | 2017-03-20 | 2 | -3/+4 |
| | | | |||||
* | | | Fix issue #196 | Diego Nehab | 2017-03-20 | 1 | -0/+1 |
| | | | |||||
* | | | Merge pull request #211 from fperrad/patch-1 | Diego Nehab | 2017-03-20 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | fix for Lua 5.3 built without number / string conversion | ||||
| * | | fix for Lua 5.3 built without number / string conversion | François Perrad | 2017-03-16 | 1 | -1/+1 |
|/ / | | | | | | | | | | | This kind of Lua could be built with this command: ``` hererocks --lua 5.3 --cflags="-DLUA_NOCVTN2S -DLUA_NOCVTS2N" ``` |