Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 0.10->trunk | Kim Alvefur | 2016-04-19 | 1 | -4/+3 |
|\ | |||||
| * | Merge 0.9->0.10 | Kim Alvefur | 2016-04-19 | 1 | -4/+3 |
| |\ | |||||
| | * | net.server_event: Return the correct value as timeout | Kim Alvefur | 2016-04-19 | 1 | -1/+1 |
| | | | |||||
| | * | net.server_event: Fix traceback if event re-added during starttls | Kim Alvefur | 2016-04-19 | 1 | -4/+3 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2016-04-19 | 1 | -0/+4 |
|\| | | |||||
| * | | Merge 0.9->0.10 | Kim Alvefur | 2016-04-19 | 1 | -0/+4 |
| |\| | |||||
| | * | net.server_event: Re-add write event if writebuffer is non-empty after write ↵ | Kim Alvefur | 2016-04-19 | 1 | -0/+4 |
| | | | | | | | | | | | | (eg due to writes from ondrain callback) (fixes #661) | ||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2016-04-06 | 1 | -1/+0 |
|\| | | |||||
| * | | server_event: addclient: wrapclient already calls startconnection for us ↵ | daurnimator | 2013-12-18 | 1 | -2/+1 |
| | | | | | | | | | | | | [backported from trunk] | ||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2016-04-05 | 1 | -17/+22 |
|\| | | |||||
| * | | server_event: Split long list of assignments into multiple lines for readability | Kim Alvefur | 2016-04-05 | 1 | -4/+7 |
| | | | |||||
| * | | server_event: Fix indentation (again) | Kim Alvefur | 2016-04-05 | 1 | -526/+527 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2016-03-02 | 1 | -7/+8 |
|\| | | |||||
| * | | Merge 0.9->0.10 | Kim Alvefur | 2016-03-02 | 1 | -525/+526 |
| |\| | |||||
| | * | net.server_event: Return true from conn:resume() to indicate success | Kim Alvefur | 2016-03-02 | 1 | -0/+1 |
| | | | |||||
| | * | net.server_event: Prevent resuming connections without readcallback, eg ↵ | Kim Alvefur | 2016-03-02 | 1 | -1/+1 |
| | | | | | | | | | | | | closed connections (fixes #590) | ||||
* | | | Merge 0.10->trunk | Matthew Wild | 2016-01-02 | 1 | -0/+1 |
|\| | | |||||
| * | | net.server_event: Add conn.type == 'server' for server sockets (fixes ↵ | Matthew Wild | 2016-01-02 | 1 | -0/+1 |
| | | | | | | | | | | | | closeallservers() ) | ||||
* | | | net.server_event: Return event handle from add_task so it can be closed by ↵ | Kim Alvefur | 2015-11-22 | 1 | -0/+1 |
| | | | | | | | | | | | | eg util.timer | ||||
* | | | server_event: Remove needless scoping around add_task | Kim Alvefur | 2015-09-25 | 1 | -13/+9 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2015-09-25 | 1 | -643/+590 |
|\| | | |||||
| * | | server_event: Fix indentation | Kim Alvefur | 2015-09-25 | 1 | -5/+5 |
| | | | |||||
| * | | server_event: Put function keyword on same line as the coroutine.wrap it's ↵ | Kim Alvefur | 2015-09-25 | 1 | -2/+1 |
| | | | | | | | | | | | | being passed to | ||||
| * | | server_event: Normalize indentation | Kim Alvefur | 2015-09-25 | 1 | -118/+118 |
| | | | |||||
| * | | server_event: Remove unused argument [luacheck] | Kim Alvefur | 2015-09-25 | 1 | -1/+1 |
| | | | |||||
| * | | server_event: Comment out the unused vdebug function [luacheck] | Kim Alvefur | 2015-09-25 | 1 | -1/+1 |
| | | | |||||
| * | | server_event: Remove unused former argument (fixes global access) [luacheck] | Kim Alvefur | 2015-09-25 | 1 | -1/+1 |
| | | | |||||
| * | | server_event: Rename luaevent module variable to avoid name clash [luacheck] | Kim Alvefur | 2015-09-25 | 1 | -7/+7 |
| | | | |||||
| * | | server_event: Add luacheck annotations | Kim Alvefur | 2015-09-25 | 1 | -1/+2 |
| | | | |||||
| * | | server_event: Remove needless scoping and indentation | Kim Alvefur | 2015-09-25 | 1 | -579/+562 |
| | | | |||||
| * | | server_event: Move local references to various functions to top of file | Kim Alvefur | 2015-09-25 | 1 | -22/+18 |
| | | | |||||
| * | | server_event: Replace implementation of ordered set with a simple table set | Kim Alvefur | 2015-09-25 | 1 | -38/+6 |
| | | | |||||
| * | | net.server_{select,event}: addclient: Use getaddrinfo to detect IP address ↵ | Kim Alvefur | 2013-12-23 | 1 | -1/+8 |
| | | | | | | | | | | | | type if no socket type argument given. (Argument must be given for non-TCP) | ||||
| * | | net.server_{select,event}: addclient: Add argument for overriding socket type | Kim Alvefur | 2013-12-23 | 1 | -2/+9 |
| | | | |||||
| * | | net/server_event: pcall require ssl rather than relying on globals | daurnimator | 2013-12-18 | 1 | -15/+7 |
| | | | |||||
| * | | net/server_event: add_client should have same arguments no-matter the server ↵ | daurnimator | 2013-12-18 | 1 | -21/+6 |
| | | | | | | | | | | | | backend | ||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2015-08-20 | 1 | -4/+4 |
|\| | | |||||
| * | | net.server_{select,event}: Don't rely on LuaSocket and LuaSec being present ↵ | Kim Alvefur | 2015-02-23 | 1 | -6/+6 |
| | | | | | | | | | | | | in the globals table | ||||
* | | | Move timer code out of util.timer and into relevant net.server backends | daurnimator | 2014-10-20 | 1 | -0/+18 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2014-09-02 | 1 | -3/+8 |
|\| | | |||||
| * | | Merge 0.9->0.10 | Kim Alvefur | 2014-09-02 | 1 | -3/+8 |
| |\| | |||||
| | * | net.server_{select,event}: Add 'ondetach' callback for listener objects, to ↵ | Matthew Wild | 2014-08-29 | 1 | -2/+8 |
| | | | | | | | | | | | | notify them when another listener is being assigned to a connection | ||||
* | | | Merge 0.10->trunk | Matthew Wild | 2014-07-25 | 1 | -0/+1 |
|\| | | |||||
| * | | Merge 0.9->0.10 | Matthew Wild | 2014-07-25 | 1 | -0/+1 |
| |\| | |||||
| | * | net.server_select/event: Switch sender mode to *a when reading, to make sure ↵ | Matthew Wild | 2014-07-25 | 1 | -0/+1 |
| | | | | | | | | | | | | we get all available data | ||||
* | | | net/server_*: Fix addclient: LuaSocket 3.0-rc1 sometimes returns EALREADY ↵ | daurnimator | 2014-06-25 | 1 | -1/+1 |
| | | | | | | | | | | | | instead of EINPROGRESS when the dns lookup has multiple results | ||||
* | | | Merge 0.10->trunk | Matthew Wild | 2014-04-02 | 1 | -0/+1 |
|\| | | |||||
| * | | Merge 0.9->0.10 | Matthew Wild | 2014-04-02 | 1 | -77/+80 |
| |\ \ | | |/ | |/| | |||||
| * | | net.server_{select,event}: Add compat code for supporting the same client ↵ | Kim Alvefur | 2014-04-01 | 1 | -0/+1 |
| | | | | | | | | | | | | port API on connections | ||||
| * | | Backed out changeset a5b5bce71a11 | Kim Alvefur | 2014-03-31 | 1 | -1/+1 |
| | | |