Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 0.10->trunk | Kim Alvefur | 2016-01-22 | 1 | -22/+22 |
|\ | |||||
| * | Merge 0.9->0.10 | Kim Alvefur | 2016-01-22 | 1 | -1/+1 |
| |\ | |||||
| | * | server_select: Retry accepting clients from full servers after 10s (matches ↵ | Kim Alvefur | 2016-01-22 | 1 | -1/+1 |
| | | | | | | | | | | | | libevent behaviour) | ||||
* | | | 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 | ||||
* | | | net/server: Split up different backends in a nicer way. Add global config ↵ | daurnimator | 2014-10-17 | 1 | -38/+51 |
|/ / | | | | | | | option 'server' | ||||
* / | Remove all trailing whitespace | Florian Zeitz | 2013-08-09 | 1 | -1/+1 |
|/ | |||||
* | net.server*: Allow the TCP backlog parameter to be set in the config | Kim Alvefur | 2013-04-27 | 1 | -0/+1 |
| | |||||
* | net.server, _select: Reorganise configuration of server_select to be more ↵ | Kim Alvefur | 2013-03-23 | 1 | -3/+11 |
| | | | | like server_event | ||||
* | net.server: No sections in config anymore | Kim Alvefur | 2013-03-23 | 1 | -2/+2 |
| | |||||
* | net.server: Don't return anything from config-reloaded hook, fixes logrotate ↵ | Kim Alvefur | 2012-12-29 | 1 | -2/+1 |
| | | | | heisenbug | ||||
* | net.server: Fix when no network_settings set and using libevent | Kim Alvefur | 2012-11-23 | 1 | -1/+1 |
| | |||||
* | net.server: Make server_* configurable in the config file. | Kim Alvefur | 2012-11-23 | 1 | -0/+32 |
| | |||||
* | net.server: server_select != server_event (thanks Nulani, Florob) | Matthew Wild | 2012-05-03 | 1 | -1/+1 |
| | |||||
* | net.server, net.timer, net.server_select: Rearrange dependencies between ↵ | Matthew Wild | 2012-05-03 | 1 | -14/+2 |
| | | | | these three modules. server.addtimer() is no longer a public function (renamed to _addtimer) and is not available at all from server_event (compat code removed to prevent traceback) (thanks Nulani) | ||||
* | net.server: Don't load configmanager if not running inside Prosody, assume ↵ | Matthew Wild | 2010-08-23 | 1 | -1/+1 |
| | | | | server_select | ||||
* | Merge 0.6->0.7 | Matthew Wild | 2010-03-22 | 1 | -0/+7 |
|\ | |||||
| * | Update copyright headers for 2010 | Matthew Wild | 2010-03-22 | 1 | -1/+1 |
| | | |||||
| * | net.server_select: Restore checks for wantread/timeout errors on receive | Matthew Wild | 2009-12-03 | 1 | -1/+1 |
| | | |||||
| * | net.server_select: Make bufferlen() method return, of all things, the buffer ↵ | Matthew Wild | 2009-12-03 | 1 | -1/+1 |
| | | | | | | | | length | ||||
| * | net.server_select: Fix possibility of losing data sent from a socket just ↵ | Matthew Wild | 2009-12-03 | 1 | -1/+1 |
| | | | | | | | | before it closes (thanks Sjoerd Simons) | ||||
* | | net.server: Remove redundant commented code and some trailing whitespace | Matthew Wild | 2010-02-15 | 1 | -2/+1 |
| | | |||||
* | | net.server: When libevent backend is in use, override signal.signal to use ↵ | Matthew Wild | 2010-01-10 | 1 | -0/+17 |
| | | | | | | | | server.hook_signal | ||||
* | | net.server: Log an error when libevent is requested, but luaevent is ↵ | Waqas Hussain | 2009-11-24 | 1 | -2/+9 |
| | | | | | | | | unavailable, and don't load luaevent when not requested. | ||||
* | | net.server: Add some comments to explain to waqas how it all works :) | Matthew Wild | 2009-11-22 | 1 | -1/+6 |
| | | |||||
* | | net.server: Small fix for addtimer() compatibility code | Matthew Wild | 2009-11-21 | 1 | -1/+1 |
| | | |||||
* | | net.server: New net.server to choose the appropriate library from ↵ | Matthew Wild | 2009-11-21 | 1 | -0/+21 |
| | | | | | | | | server_select/server_event based on the availability of luaevent and the use_libevent config option | ||||
* | | net.server: Rename to net.server_select | Matthew Wild | 2009-11-21 | 1 | -914/+0 |
|/ | |||||
* | server.lua: Standardise on 'client' variable to refer to the socket, makes ↵ | Matthew Wild | 2009-10-26 | 1 | -3/+3 |
| | | | | the code a bit cleaner | ||||
* | server.lua: Add addsocket(), refactor all code to use it, fixes nasty socket ↵ | Matthew Wild | 2009-10-26 | 1 | -21/+18 |
| | | | | object leak - moral of the story is to not duplicate code, and not prematurely optimise. But you knew that already didn't you? | ||||
* | net.server: Allow changing the sslctx of a connection after it has been ↵ | Matthew Wild | 2009-10-17 | 1 | -16/+22 |
| | | | | established | ||||
* | Merge with 0.5 | Matthew Wild | 2009-10-14 | 1 | -7/+9 |
|\ | |||||
| * | net.server: Better handling of closing sockets during send | Matthew Wild | 2009-10-14 | 1 | -6/+9 |
| | | |||||
* | | net.server: Small logging improvements | Matthew Wild | 2009-10-04 | 1 | -3/+3 |
| | | |||||
* | | net.server: Pass current time to timer callbacks | Matthew Wild | 2009-10-04 | 1 | -1/+1 |
| | | |||||
* | | net.server: Increase SSL handshake round-trip limit, and make it configurable | Matthew Wild | 2009-10-04 | 1 | -2/+4 |
| | | |||||
* | | net.server: Call handler's status() to notify it of ssl handshake success | Matthew Wild | 2009-10-04 | 1 | -1/+2 |
| | | |||||
* | | net.server: Provide a way to get sslctx of a client connection | Matthew Wild | 2009-10-04 | 1 | -0/+3 |
| | | |||||
* | | net.server: Provide a way to get sslctx of a server | Matthew Wild | 2009-10-04 | 1 | -0/+3 |
| | | |||||
* | | Merge with 0.5 | Matthew Wild | 2009-10-02 | 1 | -1/+1 |
|\| | |||||
| * | net.server: Fix missing concatenation operator in error message | Matthew Wild | 2009-10-02 | 1 | -1/+1 |
| | | |||||
* | | Merge with 0.5 | Matthew Wild | 2009-09-21 | 1 | -0/+1 |
|\| | |||||
| * | net.server: Fix traceback when closing connections with buffered data get ↵ | Matthew Wild | 2009-09-21 | 1 | -0/+1 |
| | | | | | | | | closed during send | ||||
| * | net.server: Add checking for nil sockets to prevent traceback | Matthew Wild | 2009-08-18 | 1 | -7/+13 |
| | | |||||
* | | net.server: Add checking for nil sockets to prevent traceback | Matthew Wild | 2009-08-18 | 1 | -7/+13 |
| | | |||||
* | | net.server: Comment all calls to mem_free/collectgarbage... not really ↵ | Matthew Wild | 2009-08-16 | 1 | -5/+5 |
|/ | | | | suitable for a realtime server, let's trust Lua's GC - it's good. | ||||
* | net.server: Much improve SSL/TLS error reporting, do our best to understand ↵ | Matthew Wild | 2009-07-28 | 1 | -6/+27 |
| | | | | and hide OpenSSL's ridiculously unfriendly error messages | ||||
* | net.server: Fail to open port if legacy SSL requested, but SSL not available | Matthias Diene | 2009-07-23 | 1 | -1/+6 |
| |