aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge 0.10->trunkKim Alvefur2015-05-052-3/+4
|\
| * util.statistics: Collect duration sample even if run fewer times than the ↵Kim Alvefur2015-05-051-2/+2
| | | | | | | | sample interval
| * 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 ↵Kim Alvefur2015-04-261-1/+1
| | | | | | | | | | | | *signed* int (blame Lua). Closes #439
| | * 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 ↵Kim Alvefur2015-05-021-1/+4
| | | | | | | | | | | | we do here?)
| * | 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 ↵Matthew Wild2015-04-281-1/+67
| | | | | | | | | | | | calling of event handlers to run code before/after an event (for debugging, statistics, logging purposes, etc.)
| * | 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 ↵Kim Alvefur2015-04-051-0/+3
| | | | | | | | | | | | top level error)
* | | 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
| | |
| * | rostermanager: Remove unused parameterMatthew Wild2015-04-031-1/+1
| | |
| * | util-src/*.c: astyle --indent=tab --brackets=attach --indent-switches ↵Kim Alvefur2015-04-037-716/+846
| | | | | | | | | | | | --break-blocks --pad-oper --unpad-paren --add-brackets --align-pointer=type --lineend=linux
* | | Merge 0.10->trunkKim Alvefur2015-04-036-29/+50
|\| |
| * | rostermanager, mod_roster, mod_presence: Move pending roster items to roster ↵Kim Alvefur2015-04-033-26/+32
| | | | | | | | | | | | metadata field
| * | prosodyctl: Use ssl.loadcertificate instead of ssl.x509.load, as the ↵Kim Alvefur2015-04-021-1/+1
| | | | | | | | | | | | ssl.x509 export dissapears in 97b1974 or 356e03a
| * | prosodyctl: Document magic commit IDPaul Aurich2015-04-011-0/+1
| | |
| * | util.table, Makefile: New C module that allows pre-allocation of tables to ↵Matthew Wild2015-03-312-2/+16
| | | | | | | | | | | | improve performance and decrease memory fragmentation
* | | Merge 0.10->trunkMatthew Wild2015-03-2732-1367/+3867
|\ \ \ | |/ / |/| |
| * | Merge 0.10->trunkKim Alvefur2015-03-271-16/+6
| |\ \
| * \ \ Merge 0.10->trunkMatthew Wild2015-03-268-27/+207
| |\ \ \
| * \ \ \ Merge 0.10->trunkMatthew Wild2015-03-244-6/+58
| |\ \ \ \
| * \ \ \ \ Merge 0.10->trunkMatthew Wild2015-02-245-8/+22
| |\ \ \ \ \
| * \ \ \ \ \ MergeMatthew Wild2015-02-231-21/+34
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge 0.10->trunkKim Alvefur2015-02-093-22/+45
| | |\ \ \ \ \ \
| * | \ \ \ \ \ \ Merge 0.10->trunkMatthew Wild2015-01-312-1/+11
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge 0.10->trunkKim Alvefur2015-01-261-1/+1
| |\ \ \ \ \ \ \ \