aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge 0.10->trunkMatthew Wild2016-01-270-0/+0
|\
| * Merge 0.9->0.10Matthew Wild2016-01-270-0/+0
| |\
| | * Added tag 0.9.10 for changeset 352270bc0439Matthew Wild2016-01-270-0/+0
| | |
| | * Merge0.9.10Kim Alvefur2016-01-271-1/+2
| | |\
| | | * mod_dialback: Follow XEP-0185 and use HMACKim Alvefur2016-01-191-1/+2
| | | |
* | | | Merge 0.10->trunkKim Alvefur2016-01-262-2/+2
|\| | |
| * | | Merge 0.9->0.10Kim Alvefur2016-01-262-2/+2
| |\| |
| | * | mod_c2s, mod_s2s: Lower priority of session shutdown to negative, so that ↵Kim Alvefur2016-01-262-2/+2
| | | | | | | | | | | | | | | | plugins hooking at the default priority run first (fixes #601)
* | | | Merge 0.10->trunkKim Alvefur2016-01-224-54/+72
|\| | |
| * | | Merge 0.9->0.10Kim Alvefur2016-01-224-32/+50
| |\| |
| | * | server_select: Add logging of when servers are paused and resumedKim Alvefur2016-01-221-0/+2
| | | |
| | * | server_select: Pause and mark server as full if accepting a client fails ↵Kim Alvefur2016-01-221-0/+2
| | | | | | | | | | | | | | | | (fixes #597)
| | * | server_select: Retry accepting clients from full servers after 10s (matches ↵Kim Alvefur2016-01-222-1/+12
| | | | | | | | | | | | | | | | libevent behaviour)
| | * | server_select: Keep track of which server listeners are fullKim Alvefur2016-01-221-0/+5
| | | |
| | * | net.dns: Remember query only after it was sent, in case it was not (fixes #598)Kim Alvefur2016-01-211-5/+5
| | | |
| | * | Backout 63f5870f9afe, no longer needed since Windows is currently unsupportedKim Alvefur2016-01-211-24/+22
| | |/
* | | Merge 0.10->trunkMatthew Wild2016-01-221-3/+3
|\| |
| * | mod_admin_telnet: Fix sorting of JIDs in c2s:show() family of functions ↵Matthew Wild2016-01-221-3/+3
| | | | | | | | | | | | (thanks lookshe and Zash)
* | | MUC: Add luacheck annotations, remove unused vars, rename conflicting vars etcKim Alvefur2016-01-201-19/+22
| | |
* | | Merge 0.10->trunkKim Alvefur2016-01-201-2/+3
|\| |
| * | mod_dialback: Follow XEP-0185 and use HMACKim Alvefur2016-01-191-2/+3
| | |
* | | MUC: Rename variables to please luacheckKim Alvefur2016-01-204-9/+8
| | |
* | | Merge 0.10->trunkKim Alvefur2016-01-166-11/+28
|\| |
| * | net.http.server: Return from listen_on() whatever net.server.addserver() returnsKim Alvefur2016-01-161-1/+1
| | |
| * | util.random: Open /dev/urandom read-only, make seed() a noopKim Alvefur2016-01-121-4/+2
| | |
| * | prosodyctl: check config: Suggest moving modules enabled on all hosts to a ↵Kim Alvefur2016-01-121-0/+14
| | | | | | | | | | | | global_modules enabled if that is unset
| * | prosody: Allow prosody.shutdown() to take an exit code for the process ↵Matthew Wild2016-01-151-2/+7
| | | | | | | | | | | | (thanks daurnimator)
| * | prosodyctl check: Fix traceback if the global modules_enabled is unsetKim Alvefur2016-01-121-2/+2
| | |
| * | mod_blocklist: Clear second level cache correctly on user deletionKim Alvefur2016-01-111-1/+1
| | |
| * | Merge 0.9->0.10Kim Alvefur2016-01-111-1/+1
| |\|
| | * core: Increase default read size to "all of it", in practice 8K (size of ↵Kim Alvefur2016-01-101-1/+1
| | | | | | | | | | | | LuaSockets buffer)
| | * util.uuid: Open /dev/urandom read-only, make seed() a noopKim Alvefur2016-01-101-4/+2
| | |
* | | MUC: Fix global access when setting 'whois', probably resulted in wrong ↵Kim Alvefur2016-01-111-1/+1
| | | | | | | | | | | | status code return (thanks EmilyRose)
* | | Merge 0.10->trunkKim Alvefur2016-01-107-31/+71
|\| |
| * | tests: Add test for util.uuid (checks that the output format is correct)Kim Alvefur2016-01-102-0/+25
| | |
| * | tests: Correct mistake from latst merge, use the same variable name in all 3 ↵Kim Alvefur2016-01-101-2/+2
| | | | | | | | | | | | places where it matters
| * | Makefile: Add 'test' target that runs testsKim Alvefur2016-01-101-0/+3
| | |
| * | mod_admin_telnet: c2s:count in less linesKim Alvefur2016-01-101-7/+1
| | |
| * | mod_admin_telnet: Show unauthenticated clients identified by local/remote IP ↵Kim Alvefur2016-01-091-1/+7
| | | | | | | | | | | | and port
| * | mod_admin_telnet: c2s:show() etc, list all sessions including ↵Kim Alvefur2016-01-091-9/+20
| | | | | | | | | | | | unauthenticated or not with no stream opened
| * | mod_admin_telnet: Remove compat warning about 'console_banner' as a functionKim Alvefur2016-01-101-9/+5
| | |
| * | net.server_select: Add 'server' method to client connections (present in ↵Kim Alvefur2016-01-091-0/+3
| | | | | | | | | | | | server_event)
| * | prosodyctl: Show an example ssl config after generating a certificateKim Alvefur2016-01-091-0/+2
| | |
| * | rostermanager: Rename variable to avoid name clash [luacheck]Kim Alvefur2016-01-091-4/+4
| | |
* | | Merge 0.10->trunkKim Alvefur2016-01-086-31/+52
|\| |
| * | tests: Fix merge, modulemanager test was removedKim Alvefur2016-01-081-1/+0
| | |
| * | Merge 0.9->0.10Kim Alvefur2016-01-084-6/+48
| |\|
| | * Added tag 0.9.9 for changeset 7ec52755622fMatthew Wild2016-01-080-0/+0
| | |
| | * Backout 88d54bec26b7 prior to release, as it certainly requires more testing0.9.9Matthew Wild2016-01-081-1/+3
| | |
| | * mod_http_files: Santize the path relative to our base URL before translating ↵Matthew Wild2016-01-071-1/+33
| | | | | | | | | | | | it to a filesystem path, fixes a relative path traversal vulnerability