aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge 0.10->trunkMatthew Wild2015-05-0613-37/+61
|\
| * MergeMatthew Wild2015-05-068-10/+20
| |\
| | * mod_s2s: Fire read timeout event on correct virtualhost for incoming connectionsKim Alvefur2015-05-061-1/+2
| | * mod_pubsub: Add option for default affiliation of non-existent nodes (thanks ...Kim Alvefur2015-05-051-1/+5
| * | util.events: Add get_handlers() methodMatthew Wild2015-05-061-0/+4
| * | portmanager, s2smanager, sessionmanager, stanza_router, storagemanager, userm...Matthew Wild2015-05-067-8/+11
| * | rostermanager: Variable rename for clarity and to avoid name clash [luacheck]Matthew Wild2015-05-061-4/+4
| * | modulemanager: Add luacheck annotationsMatthew Wild2015-05-061-3/+4
| * | modulemanager: Remove unused import of pcall #luacheckMatthew Wild2015-05-061-2/+2
| * | moduleapi: Import util.stanza required for module:broadcast()Matthew Wild2015-05-061-0/+1
| * | moduleapi: Add luacheck annotationMatthew Wild2015-05-061-1/+1
| * | moduleapi: Minor variable renaming to avoid clashes with the 'type' functionMatthew Wild2015-05-061-14/+14
| * | moduleapi: Clear self.event_handlers when unhooking an event, to prevent leaksMatthew Wild2015-05-061-0/+1
| * | moduleapi: module:measure_event(), module:measure_global_event(): Fix copy/pa...Matthew Wild2015-05-061-2/+2
| * | moduleapi: Remove accidental use of undefined and unnecessary 'priority' vari...Matthew Wild2015-05-061-1/+1
| * | moduleapi: Add module:broadcast() to send a stanza to a list of JIDsMatthew Wild2015-05-061-0/+9
* | | Merge 0.10->trunkKim Alvefur2015-05-052-3/+4
|\ \ \ | | |/ | |/|
| * | util.statistics: Collect duration sample even if run fewer times than the sam...Kim Alvefur2015-05-051-2/+2
| * | util.events: Add local reference to table.remove (fixes traceback)Kim Alvefur2015-05-051-1/+2
* | | Merge 0.10->trunkKim Alvefur2015-05-037-7/+108
|\| |
| * | Merge 0.9->0.10Kim Alvefur2015-05-032-2/+2
| |\ \
| | * | net.dns: Make sure argument to math.randomseed does not overflow a 32 bit *si...Kim Alvefur2015-04-261-1/+1
| | * | util.datamanager: Fix traceback due to %s in log messageKim Alvefur2015-04-031-1/+1
| * | | util.encodings: Move declarations to top of function [pedantic]Kim Alvefur2015-05-021-2/+3
| * | | util.pposix: Return error from ftruncate if that fails too (but what would we...Kim Alvefur2015-05-021-1/+4
| | |/ | |/|
| * | util.events: Change from nil to false to indicate adding a global wrapperMatthew Wild2015-04-281-2/+2
| * | moduleapi: New methods for modules to conveniently wrap eventsMatthew Wild2015-04-281-0/+12
| * | moduleapi: Experimental API for modules to measure the rate+duration of eventsMatthew Wild2015-04-281-0/+19
| * | util.events: Add support for event wrappers, functions which can wrap the cal...Matthew Wild2015-04-281-1/+67
| * | prosodyctl: check certs: Correctly check that certificates are valid for s2sKim Alvefur2015-04-271-1/+1
* | | Merge 0.10->trunkKim Alvefur2015-04-271-1/+3
|\| |
| * | configure: Set default compiler and linker to cc and ld on *bsd (thanks Tobias)Kim Alvefur2015-04-261-0/+2
| * | configure: Mention openbsd preset in --helpKim Alvefur2015-04-261-1/+1
* | | Merge 0.10->trunkKim Alvefur2015-04-267-27/+27
|\| |
| * | Merge 0.9->0.10Kim Alvefur2015-04-262-15/+8
| |\|
| | * net.dns, mod_s2s: Add chasing of CNAMEs to net.dns and remove it from mod_s2sKim Alvefur2015-04-242-15/+8
| * | mod_c2s, mod_s2s: Collect statistics on number of connectionsKim Alvefur2015-04-262-0/+8
| * | mod_blocklist: Some cleanup [luacheck]Kim Alvefur2015-04-251-9/+8
| * | usermanager: Capitalize log messageKim Alvefur2015-04-251-1/+1
| * | mod_admin_adhoc: Remove special treatment of the "pending" roster entryKim Alvefur2015-04-251-2/+2
* | | mod_s2s: Catch attempt to close dummy origin of s2s error replies (fixes a to...Kim Alvefur2015-04-051-0/+3
* | | Merge 0.10->trunkKim Alvefur2015-04-051-6/+5
|\| |
| * | rostermanager: Fix roster upgrade code (thanks mva)Kim Alvefur2015-04-051-6/+5
* | | Merge 0.10->trunkKim Alvefur2015-04-051-0/+1
|\| |
| * | rostermanager: Add missing import of `type()`Florian Zeitz2015-04-031-0/+1
* | | Merge 0.10->trunkMatthew Wild2015-04-0310-730/+861
|\| |
| * | util-src/*.c: Per convention call luaL_error() as argument to returnFlorian Zeitz2015-04-033-5/+6
| * | sessionmanager: Rename parameter to avoid varible name conflictMatthew Wild2015-04-031-2/+2
| * | hostmanager: Rename variable to avoid shadowing 'type()' functionMatthew Wild2015-04-031-2/+2
| * | loggingmanager: Improve code structure (removes empty if branch)Matthew Wild2015-04-031-9/+9