Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 0.10->trunk | Kim Alvefur | 2016-04-19 | 1 | -1/+1 |
|\ | |||||
| * | Merge 0.9->0.10 | Kim Alvefur | 2016-04-19 | 1 | -1/+1 |
| |\ | |||||
| | * | net.server_event: Check the buffer *length*, not the buffer itself (Fixes ↵ | Kim Alvefur | 2016-04-19 | 1 | -1/+1 |
| | | | | | | | | | | | | 100% cpu usage introduced in 65abd9d7bf88) | ||||
* | | | 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) | ||||
* | | | Update every link to the documentation to use HTTPS | Emmanuel Gil Peyrot | 2016-04-16 | 2 | -2/+2 |
| | | | |||||
* | | | 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-29 | 1 | -2/+2 |
|\| | | |||||
| * | | net.server_select: Remove do-nothing os_difftime calls [backported from trunk] | daurnimator | 2015-01-19 | 1 | -5/+3 |
| | | | |||||
| * | | net.dns: Import unpack() in forward-compatible way (Fixes compat with Lua5.2+) | Kim Alvefur | 2016-03-28 | 1 | -2/+2 |
| | | | |||||
* | | | Merge 0.10->trunk | Matthew Wild | 2016-03-10 | 1 | -1/+0 |
|\| | | |||||
| * | | net.websocket.frames, util.datetime, util.json, util.prosodyctl, ↵ | Matthew Wild | 2016-03-10 | 1 | -1/+0 |
| | | | | | | | | | | | | util.rfc6724: Remove unused variables [luacheck] | ||||
* | | | 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 | Kim Alvefur | 2016-01-22 | 3 | -30/+50 |
|\| | | |||||
| * | | Merge 0.9->0.10 | Kim Alvefur | 2016-01-22 | 3 | -8/+28 |
| |\| | |||||
| | * | server_select: Add logging of when servers are paused and resumed | Kim Alvefur | 2016-01-22 | 1 | -0/+2 |
| | | | |||||
| | * | server_select: Pause and mark server as full if accepting a client fails ↵ | Kim Alvefur | 2016-01-22 | 1 | -0/+2 |
| | | | | | | | | | | | | (fixes #597) | ||||
| | * | server_select: Retry accepting clients from full servers after 10s (matches ↵ | Kim Alvefur | 2016-01-22 | 2 | -1/+12 |
| | | | | | | | | | | | | libevent behaviour) | ||||
| | * | server_select: Keep track of which server listeners are full | Kim Alvefur | 2016-01-22 | 1 | -0/+5 |
| | | | |||||
| | * | net.dns: Remember query only after it was sent, in case it was not (fixes #598) | Kim Alvefur | 2016-01-21 | 1 | -5/+5 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2016-01-16 | 1 | -1/+1 |
|\| | | |||||
| * | | net.http.server: Return from listen_on() whatever net.server.addserver() returns | Kim Alvefur | 2016-01-16 | 1 | -1/+1 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2016-01-10 | 1 | -0/+3 |
|\| | | |||||
| * | | net.server_select: Add 'server' method to client connections (present in ↵ | Kim Alvefur | 2016-01-09 | 1 | -0/+3 |
| | | | | | | | | | | | | server_event) | ||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2016-01-08 | 1 | -2/+4 |
|\| | | |||||
| * | | Merge 0.9->0.10 | Kim Alvefur | 2016-01-08 | 1 | -2/+4 |
| |\| | |||||
| | * | Backout 88d54bec26b7 prior to release, as it certainly requires more testing | Matthew Wild | 2016-01-08 | 1 | -1/+3 |
| | | | |||||
| | * | net.dns: Allow a zone id in resolv.conf (eg like %eth0) | Kim Alvefur | 2016-01-04 | 1 | -1/+1 |
| | | | |||||
| | * | net.dns: Support IPv6 addresses in resolv.conf [Backported from 0.10] | Florian Zeitz | 2013-06-18 | 1 | -6/+13 |
| | | | |||||
* | | | Merge 0.10->trunk | Matthew Wild | 2016-01-04 | 1 | -2/+3 |
|\| | | |||||
| * | | server_select: Forward the actual TLS handshake error message | Kim Alvefur | 2016-01-03 | 1 | -2/+3 |
| | | | |||||
* | | | Merge 0.10->trunk | Matthew Wild | 2016-01-02 | 2 | -0/+2 |
|\| | | |||||
| * | | net.server_select: Close all connections when quitting (and not just ↵ | Matthew Wild | 2016-01-02 | 1 | -0/+1 |
| | | | | | | | | | | | | stepping), matches server_event | ||||
| * | | net.server_event: Add conn.type == 'server' for server sockets (fixes ↵ | Matthew Wild | 2016-01-02 | 1 | -0/+1 |
| | | | | | | | | | | | | closeallservers() ) | ||||
* | | | Merge 0.10->trunk | Matthew Wild | 2015-12-03 | 1 | -0/+1 |
|\| | | |||||
| * | | net.http.server: Import util.cache | Matthew Wild | 2015-12-03 | 1 | -0/+1 |
| | | | |||||
* | | | Merge 0.10->trunk | Matthew Wild | 2015-12-03 | 1 | -5/+5 |
|\| | | |||||
| * | | net.http.server: Use new util.cache to remember wildcard event handlers | Matthew Wild | 2015-12-03 | 1 | -5/+5 |
| | | |