aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | MergeKim Alvefur2015-09-252-3/+17
| |\ \
| | * | Merge 0.9->0.10Matthew Wild2015-09-252-3/+17
| | |\|
| | | * mod_pep: Don't store contacts' subscriptions to a user's nodes when that ↵Matthew Wild2015-09-251-0/+12
| | | | | | | | | | | | | | | | user is offline
| | | * mod_pep: Document data structures, so I don't have to spend time remembering ↵Matthew Wild2015-09-041-0/+4
| | | | | | | | | | | | | | | | every time I work on this module
| | | * net.dns: Unconditionally cache records found in answersMatthew Wild2015-05-251-3/+1
| | | |
* | | | server_event: Remove needless scoping around add_taskKim Alvefur2015-09-251-13/+9
| | | |
* | | | Merge 0.10->trunkKim Alvefur2015-09-253-644/+596
|\| | |
| * | | server_event: Fix indentationKim Alvefur2015-09-251-5/+5
| | | |
| * | | server_event: Put function keyword on same line as the coroutine.wrap it's ↵Kim Alvefur2015-09-251-2/+1
| |/ / | | | | | | | | | being passed to
| * | server_event: Normalize indentationKim Alvefur2015-09-251-118/+118
| | |
| * | net.dns: Use new IPv4-specific socket factory if available (fixes dns on ↵Kim Alvefur2015-09-251-1/+1
| | | | | | | | | | | | libevent with latest development version of luasocket)
| * | server_event: Remove unused argument [luacheck]Kim Alvefur2015-09-251-1/+1
| | |
| * | server_event: Comment out the unused vdebug function [luacheck]Kim Alvefur2015-09-251-1/+1
| | |
| * | server_event: Remove unused former argument (fixes global access) [luacheck]Kim Alvefur2015-09-251-1/+1
| | |
| * | server_event: Rename luaevent module variable to avoid name clash [luacheck]Kim Alvefur2015-09-251-7/+7
| | |
| * | server_event: Add luacheck annotationsKim Alvefur2015-09-251-1/+2
| | |
| * | server_event: Remove needless scoping and indentationKim Alvefur2015-09-251-579/+562
| | |
| * | server_event: Move local references to various functions to top of fileKim Alvefur2015-09-251-22/+18
| | |
| * | server_event: Replace implementation of ordered set with a simple table setKim Alvefur2015-09-251-38/+6
| | |
| * | mod_s2s: Account for connections that time out in connection count measureKim Alvefur2015-09-251-0/+5
| | |
* | | Merge 0.10->trunkKim Alvefur2015-09-243-3/+50
|\| |
| * | mod_c2s, mod_s2s: Close incoming connections if there are no features to ↵Kim Alvefur2015-09-242-3/+13
| | | | | | | | | | | | offer on incomplete streams (fixes #285)
| * | prosodyctl check: Warn if certificate checking is enforced but LuaSec is too oldKim Alvefur2015-09-241-0/+24
| | |
| * | prosodyctl check: Warn if encryption is required but LuaSec is unavailableKim Alvefur2015-09-241-0/+13
| | |
* | | Merge 0.10->trunkKim Alvefur2015-09-227-39/+80
|\| |
| * | sessionmanager: Make session.send() return true unless there really is an errorKim Alvefur2015-09-211-1/+7
| | |
| * | plugins: Explicitly return to halt event propagation (session.send sometimes ↵Kim Alvefur2015-09-215-37/+74
| | | | | | | | | | | | does not return true)
| * | Makefile: Fix building prosody.version (.hg/dirstate is a file, not a directory)Kim Alvefur2015-09-211-1/+1
| | |
* | | Merge 0.10->trunkKim Alvefur2015-09-192-11/+23
|\| |
| * | mod_admin_telnet: Fix indentationKim Alvefur2015-09-181-5/+5
| | |
| * | prosodyctl: Move files out of the way when generating new cert or keyKim Alvefur2015-09-191-6/+18
| | |
* | | util.timer: Fix indentationKim Alvefur2015-09-181-6/+6
| | |
* | | Merge 0.10->trunkKim Alvefur2015-09-174-44/+48
|\| |
| * | mod_offline: Decrease priority of event handlers so 3rd party hooks fire ↵Kim Alvefur2015-09-161-2/+2
| | | | | | | | | | | | first by default
| * | mod_blocklist: Explicitly halt event propagation after returning a reply ↵Kim Alvefur2015-09-161-6/+12
| | | | | | | | | | | | (send returns nil sometimes)
| * | mod_tls: Fix inhertinance of 'ssl' option from "parent" host to subdomain ↵Kim Alvefur2015-09-151-10/+12
| | | | | | | | | | | | (fixes #511)
| * | MUC: Break a very long lineKim Alvefur2015-09-121-2/+4
| | |
| * | util.dataforms: Fix interaction of required fields and empty string values ↵Kim Alvefur2015-09-121-3/+4
| | | | | | | | | | | | (fixes #521)
| * | util.dataforms: Refactor parsing to reuse simple text parser instead of ↵Kim Alvefur2015-09-121-26/+21
| | | | | | | | | | | | duplicate code
* | | MUC: Prevent double replies when MUC affiliation/role change requests fail.Lance Stout2015-09-171-2/+5
| | |
* | | MUC: Fix traceback in request for MUC affiliation lists by non-affiliated ↵Kim Alvefur2015-09-151-1/+1
| | | | | | | | | | | | (thanks Lance)
* | | Merge 0.10->trunkMatthew Wild2015-09-042-2/+7
|\| |
| * | tests/run_tests.sh: Let status code propagate to shellMatthew Wild2015-09-041-1/+1
| | |
| * | tests: Return status code depending on whether tests passedMatthew Wild2015-09-041-1/+6
| | |
| * | net/http: Use server.addclientdaurnimator2013-12-181-11/+6
| | |
* | | Merge 0.10->trunkKim Alvefur2015-09-031-0/+1
|\| |
| * | util.stanza: Export xml_escape (missed during removal of module() calls)Kim Alvefur2015-09-031-0/+1
| | |
* | | Merge 0.10->trunkMatthew Wild2015-09-030-0/+0
|\| |
| * | net.server_{select,event}: addclient: Use getaddrinfo to detect IP address ↵Kim Alvefur2013-12-232-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 typeKim Alvefur2013-12-232-4/+18
| | |