aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)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 user...Matthew Wild2015-09-251-0/+12
| | * mod_pep: Document data structures, so I don't have to spend time remembering ...Matthew Wild2015-09-041-0/+4
| | * net.dns: Unconditionally cache records found in answersMatthew Wild2015-05-251-3/+1
* | | server_event: Fix indentationKim Alvefur2015-09-251-5/+5
* | | server_event: Put function keyword on same line as the coroutine.wrap it's be...Kim Alvefur2015-09-251-2/+1
|/ /
* | server_event: Normalize indentationKim Alvefur2015-09-251-118/+118
* | net.dns: Use new IPv4-specific socket factory if available (fixes dns on libe...Kim Alvefur2015-09-251-1/+1
* | 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
* | mod_c2s, mod_s2s: Close incoming connections if there are no features to offe...Kim Alvefur2015-09-242-3/+13
* | 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
* | 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
* | Makefile: Fix building prosody.version (.hg/dirstate is a file, not a directory)Kim Alvefur2015-09-211-1/+1
* | 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
* | mod_offline: Decrease priority of event handlers so 3rd party hooks fire firs...Kim Alvefur2015-09-161-2/+2
* | mod_blocklist: Explicitly halt event propagation after returning a reply (sen...Kim Alvefur2015-09-161-6/+12
* | mod_tls: Fix inhertinance of 'ssl' option from "parent" host to subdomain (fi...Kim Alvefur2015-09-151-10/+12
* | MUC: Break a very long lineKim Alvefur2015-09-121-2/+4
* | util.dataforms: Fix interaction of required fields and empty string values (f...Kim Alvefur2015-09-121-3/+4
* | util.dataforms: Refactor parsing to reuse simple text parser instead of dupli...Kim Alvefur2015-09-121-26/+21
* | 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
* | util.stanza: Export xml_escape (missed during removal of module() calls)Kim Alvefur2015-09-031-0/+1
* | net.server_{select,event}: addclient: Use getaddrinfo to detect IP address ty...Kim Alvefur2013-12-232-2/+17
* | net.server_{select,event}: addclient: Add argument for overriding socket typeKim Alvefur2013-12-232-4/+18
* | net/server_event: pcall require ssl rather than relying on globalsdaurnimator2013-12-181-15/+7
* | net/server_event: add_client should have same arguments no-matter the server ...daurnimator2013-12-181-21/+6
* | net/server_select: Fix typodaurnimator2013-12-181-1/+1
* | net/server_select: addclient: Check argumentsdaurnimator2013-12-181-0/+15
* | net/server_select: addclient: Check for failure correctly; remove wrapconnect...daurnimator2013-12-181-3/+3
* | net/server_select: Check arguments to add_server correctlydaurnimator2013-12-181-3/+4
* | configure, Makefile: Make compatible with plain Bourne shell as used on Solar...Matthew Wild2015-09-022-9/+9
* | storagemanager: Check if drivers support purging, warn otherwiseKim Alvefur2015-09-021-3/+8
* | prosody: Set a luasocket global, fixes undefined global access in loop() (pen...Kim Alvefur2015-09-021-0/+1
* | storagemanager: Export purge (fixes deleting users from usermanager) (thanks mt)Kim Alvefur2015-09-021-0/+1
* | util.sql: Export db2uri (mod_storage_sql2 command uses it) (thanks mike)Kim Alvefur2015-09-021-0/+1
* | util.sql: Log when transactions beginKim Alvefur2015-08-301-0/+1