Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 0.10->trunk | Kim Alvefur | 2016-01-26 | 2 | -2/+2 |
|\ | |||||
| * | Merge 0.9->0.10 | Kim Alvefur | 2016-01-26 | 2 | -2/+2 |
| |\ | |||||
| | * | mod_c2s, mod_s2s: Lower priority of session shutdown to negative, so that ↵ | Kim Alvefur | 2016-01-26 | 2 | -2/+2 |
| | | | | | | | | | | | | plugins hooking at the default priority run first (fixes #601) | ||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2016-01-22 | 4 | -54/+72 |
|\| | | |||||
| * | | Merge 0.9->0.10 | Kim Alvefur | 2016-01-22 | 4 | -32/+50 |
| |\| | |||||
| | * | 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 |
| | | | |||||
| | * | Backout 63f5870f9afe, no longer needed since Windows is currently unsupported | Kim Alvefur | 2016-01-21 | 1 | -24/+22 |
| | | | |||||
* | | | Merge 0.10->trunk | Matthew Wild | 2016-01-22 | 1 | -3/+3 |
|\| | | |||||
| * | | mod_admin_telnet: Fix sorting of JIDs in c2s:show() family of functions ↵ | Matthew Wild | 2016-01-22 | 1 | -3/+3 |
| | | | | | | | | | | | | (thanks lookshe and Zash) | ||||
* | | | MUC: Add luacheck annotations, remove unused vars, rename conflicting vars etc | Kim Alvefur | 2016-01-20 | 1 | -19/+22 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2016-01-20 | 1 | -2/+3 |
|\| | | |||||
| * | | mod_dialback: Follow XEP-0185 and use HMAC | Kim Alvefur | 2016-01-19 | 1 | -2/+3 |
| | | | |||||
* | | | MUC: Rename variables to please luacheck | Kim Alvefur | 2016-01-20 | 4 | -9/+8 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2016-01-16 | 6 | -11/+28 |
|\| | | |||||
| * | | net.http.server: Return from listen_on() whatever net.server.addserver() returns | Kim Alvefur | 2016-01-16 | 1 | -1/+1 |
| | | | |||||
| * | | util.random: Open /dev/urandom read-only, make seed() a noop | Kim Alvefur | 2016-01-12 | 1 | -4/+2 |
| | | | |||||
| * | | prosodyctl: check config: Suggest moving modules enabled on all hosts to a ↵ | Kim Alvefur | 2016-01-12 | 1 | -0/+14 |
| | | | | | | | | | | | | global_modules enabled if that is unset | ||||
| * | | prosody: Allow prosody.shutdown() to take an exit code for the process ↵ | Matthew Wild | 2016-01-15 | 1 | -2/+7 |
| | | | | | | | | | | | | (thanks daurnimator) | ||||
| * | | prosodyctl check: Fix traceback if the global modules_enabled is unset | Kim Alvefur | 2016-01-12 | 1 | -2/+2 |
| | | | |||||
| * | | mod_blocklist: Clear second level cache correctly on user deletion | Kim Alvefur | 2016-01-11 | 1 | -1/+1 |
| | | | |||||
| * | | Merge 0.9->0.10 | Kim Alvefur | 2016-01-11 | 1 | -1/+1 |
| |\| | |||||
| | * | core: Increase default read size to "all of it", in practice 8K (size of ↵ | Kim Alvefur | 2016-01-10 | 1 | -1/+1 |
| | | | | | | | | | | | | LuaSockets buffer) | ||||
| | * | util.uuid: Open /dev/urandom read-only, make seed() a noop | Kim Alvefur | 2016-01-10 | 1 | -4/+2 |
| | | | |||||
* | | | MUC: Fix global access when setting 'whois', probably resulted in wrong ↵ | Kim Alvefur | 2016-01-11 | 1 | -1/+1 |
| | | | | | | | | | | | | status code return (thanks EmilyRose) | ||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2016-01-10 | 7 | -31/+71 |
|\| | | |||||
| * | | tests: Add test for util.uuid (checks that the output format is correct) | Kim Alvefur | 2016-01-10 | 2 | -0/+25 |
| | | | |||||
| * | | tests: Correct mistake from latst merge, use the same variable name in all 3 ↵ | Kim Alvefur | 2016-01-10 | 1 | -2/+2 |
| | | | | | | | | | | | | places where it matters | ||||
| * | | Makefile: Add 'test' target that runs tests | Kim Alvefur | 2016-01-10 | 1 | -0/+3 |
| | | | |||||
| * | | mod_admin_telnet: c2s:count in less lines | Kim Alvefur | 2016-01-10 | 1 | -7/+1 |
| | | | |||||
| * | | mod_admin_telnet: Show unauthenticated clients identified by local/remote IP ↵ | Kim Alvefur | 2016-01-09 | 1 | -1/+7 |
| | | | | | | | | | | | | and port | ||||
| * | | mod_admin_telnet: c2s:show() etc, list all sessions including ↵ | Kim Alvefur | 2016-01-09 | 1 | -9/+20 |
| | | | | | | | | | | | | unauthenticated or not with no stream opened | ||||
| * | | mod_admin_telnet: Remove compat warning about 'console_banner' as a function | Kim Alvefur | 2016-01-10 | 1 | -9/+5 |
| | | | |||||
| * | | net.server_select: Add 'server' method to client connections (present in ↵ | Kim Alvefur | 2016-01-09 | 1 | -0/+3 |
| | | | | | | | | | | | | server_event) | ||||
| * | | prosodyctl: Show an example ssl config after generating a certificate | Kim Alvefur | 2016-01-09 | 1 | -0/+2 |
| | | | |||||
| * | | rostermanager: Rename variable to avoid name clash [luacheck] | Kim Alvefur | 2016-01-09 | 1 | -4/+4 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2016-01-08 | 6 | -31/+52 |
|\| | | |||||
| * | | tests: Fix merge, modulemanager test was removed | Kim Alvefur | 2016-01-08 | 1 | -1/+0 |
| | | | |||||
| * | | Merge 0.9->0.10 | Kim Alvefur | 2016-01-08 | 4 | -6/+48 |
| |\| | |||||
| | * | Added tag 0.9.9 for changeset 7ec52755622f | Matthew Wild | 2016-01-08 | 0 | -0/+0 |
| | | | |||||
| | * | Backout 88d54bec26b7 prior to release, as it certainly requires more testing | Matthew Wild | 2016-01-08 | 1 | -1/+3 |
| | | | |||||
| | * | mod_http_files: Santize the path relative to our base URL before translating ↵ | Matthew Wild | 2016-01-07 | 1 | -1/+33 |
| | | | | | | | | | | | | it to a filesystem path, fixes a relative path traversal vulnerability | ||||
| | * | util.uuid: Use /dev/urandom | Kim Alvefur | 2016-01-06 | 1 | -27/+16 |
| | | | |||||
| | * | net.dns: Allow a zone id in resolv.conf (eg like %eth0) | Kim Alvefur | 2016-01-04 | 1 | -1/+1 |
| | | | |||||
| | * | util.ip: Support zone id syntax in IPv6 addresses | Kim Alvefur | 2016-01-04 | 1 | -1/+5 |
| | | | |||||
| | * | net.dns: Support IPv6 addresses in resolv.conf [Backported from 0.10] | Florian Zeitz | 2013-06-18 | 1 | -6/+13 |
| | | | |||||
| | * | util.ip: Fix protocol detection of IPv6 addresses beginning with : ↵ | Matthew Wild | 2013-05-18 | 1 | -2/+4 |
| | | | | | | | | | | | | [Backported from 0.10] |