Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge 0.10->trunk | Matthew Wild | 2015-03-27 | 5 | -146/+293 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | Merge 0.10->trunk | Matthew Wild | 2015-03-26 | 1 | -18/+11 | |
| |\ \ | ||||||
| | * | | Merge 0.9->0.10 | Matthew Wild | 2015-03-26 | 1 | -18/+11 | |
| | |\| | ||||||
| * | | | net.server_select: Remove unused code | daurnimator | 2015-01-19 | 1 | -6/+0 | |
| | | | | ||||||
| * | | | net.server_select: Remove socket.sleep call from main loop | daurnimator | 2015-01-19 | 1 | -8/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | It's been there since the start; but should really not be required. People can remember an issue with FreeBSD that this solved, but this was a hack solution anyway. If that issue rears it's head again, we will solve it properly. | |||||
| * | | | net.server_select: Remove do-nothing os_difftime calls | daurnimator | 2015-01-19 | 1 | -5/+3 | |
| | | | | ||||||
| * | | | net.server_select: In add_task timer callback, use passed in time rather ↵ | daurnimator | 2015-01-15 | 1 | -2/+1 | |
| | | | | | | | | | | | | | | | | than re-fetching | |||||
| * | | | net.server_select: Fix timers not being fired until another timer fixes (or ↵ | daurnimator | 2015-01-15 | 1 | -16/+8 | |
| | | | | | | | | | | | | | | | | 1 second passes) | |||||
| * | | | net.cqueues: Fix incorrect version check | daurnimator | 2015-01-16 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | net.cqueues: Fixes hardcoded timeout for first iteration | daurnimator | 2015-01-13 | 1 | -11/+16 | |
| | | | | | | | | | | | | | | | | | | | | This was originally put in place as a fix for what ended up a cqueues bug: https://github.com/wahern/cqueues/issues/40 A check for a cqueues version with the bug fix is included. | |||||
| * | | | net.cqueues: Add workaround for luaevent callback getting collected | daurnimator | 2015-01-06 | 1 | -1/+5 | |
| | | | | ||||||
| * | | | Merge 0.10 -> trunk | Waqas Hussain | 2014-12-16 | 1 | -1/+1 | |
| |\| | | ||||||
| * | | | Merge 0.10->trunk | Kim Alvefur | 2014-11-20 | 1 | -6/+6 | |
| |\ \ \ | ||||||
| * | | | | net.cqueues: Add module that allows use of cqueues while still using ↵ | daurnimator | 2014-11-18 | 1 | -0/+65 | |
| | | | | | | | | | | | | | | | | | | | | net.server as main loop | |||||
| * | | | | Merge 0.10->trunk | Kim Alvefur | 2014-11-09 | 2 | -10/+14 | |
| |\ \ \ \ | ||||||
| * \ \ \ \ | Merge 0.10->trunk | Kim Alvefur | 2014-10-26 | 1 | -1/+1 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | net/server: Handle lack of util.signal correctly | daurnimator | 2014-10-22 | 1 | -4/+10 | |
| | | | | | | | ||||||
| * | | | | | | net/server: Remove print | daurnimator | 2014-10-22 | 1 | -1/+0 | |
| | | | | | | | ||||||
| * | | | | | | net.server: Rename 'server' config option to 'network_backend' (to select ↵ | Matthew Wild | 2014-10-22 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | which net.server implementation to use) | |||||
| * | | | | | | net/server: If server.hook_signal exists, overwrite signal.signal; else make ↵ | daurnimator | 2014-10-21 | 1 | -16/+18 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | server.hook_signal == signal.signal No longer server_event specific server.hook_signal will always exist | |||||
| * | | | | | | Move timer code out of util.timer and into relevant net.server backends | daurnimator | 2014-10-20 | 2 | -0/+64 | |
| | | | | | | | ||||||
| * | | | | | | net/server: Split up different backends in a nicer way. Add global config ↵ | daurnimator | 2014-10-17 | 1 | -38/+51 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | option 'server' | |||||
| * | | | | | | Merge 0.10->trunk | Kim Alvefur | 2014-10-05 | 2 | -4/+11 | |
| |\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | Merge 0.10->trunk | daurnimator | 2014-09-29 | 2 | -3/+3 | |
| |\ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge 0.10->trunk | Kim Alvefur | 2014-09-28 | 1 | -0/+3 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ | Merge 0.10->trunk | Kim Alvefur | 2014-09-11 | 3 | -68/+82 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ | Merge 0.10->trunk | Matthew Wild | 2014-09-05 | 2 | -49/+53 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ | Merge 0.10->trunk | Matthew Wild | 2014-09-05 | 2 | -0/+460 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | net/websocket: Add new websocket client code | daurnimator | 2014-09-03 | 2 | -0/+460 | |
| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | Merge 0.10->trunk | Matthew Wild | 2014-09-03 | 1 | -1/+5 | |
| | |\| | | | | | | | | | | ||||||
| | * | | | | | | | | | | | Merge 0.10->trunk | Kim Alvefur | 2014-09-02 | 4 | -3/+21 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge 0.10->trunk | Matthew Wild | 2014-08-28 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge 0.10->trunk | Matthew Wild | 2014-07-25 | 2 | -0/+2 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge 0.10->trunk | Matthew Wild | 2014-07-25 | 1 | -9/+6 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge 0.10->trunk | Kim Alvefur | 2014-06-30 | 2 | -1/+9 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | net/server_*: Fix addclient: LuaSocket 3.0-rc1 sometimes returns EALREADY ↵ | daurnimator | 2014-06-25 | 2 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of EINPROGRESS when the dns lookup has multiple results | |||||
| | * | | | | | | | | | | | | | | | | Merge 0.10->trunk | Kim Alvefur | 2014-04-15 | 1 | -4/+3 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge 0.10->trunk | Matthew Wild | 2014-04-15 | 1 | -9/+17 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge 0.10->trunk | Matthew Wild | 2014-04-02 | 2 | -0/+2 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | net.server_{select,event}: addclient: Handle missing getaddrinfo | Kim Alvefur | 2013-12-23 | 2 | -8/+4 | |
| | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | net.server_{select,event}: addclient: Use getaddrinfo to detect IP address ↵ | Kim Alvefur | 2013-12-23 | 2 | -2/+17 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -6/+22 | |
| | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | net/http: Use server.addclient | daurnimator | 2013-12-18 | 1 | -11/+6 | |
| | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | net/server: addclient: wrapclient already calls startconnection for us | daurnimator | 2013-12-18 | 1 | -2/+1 | |
| | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | net/server_event: pcall require ssl rather than relying on globals | daurnimator | 2013-12-18 | 1 | -19/+11 | |
| | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | net/server_select: Fix typo | daurnimator | 2013-12-18 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | net/server_select: addclient: Check arguments | daurnimator | 2013-12-18 | 1 | -0/+15 | |
| | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | net/server_select: addclient: Check for failure correctly; remove ↵ | daurnimator | 2013-12-18 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wrapconnection call on failure | |||||
| | * | | | | | | | | | | | | | | | | | | | net/server_event: add_client should have same arguments no-matter the server ↵ | daurnimator | 2013-12-18 | 1 | -21/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | backend | |||||
| | * | | | | | | | | | | | | | | | | | | | net/server_select: Check arguments to add_server correctly | daurnimator | 2013-12-18 | 1 | -3/+4 | |
| | | | | | | | | | | | | | | | | | | | | |