aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
* | rostermanager: Fix roster upgrade code (thanks mva)Kim Alvefur2015-04-051-6/+5
| |
* | rostermanager: Add missing import of `type()`Florian Zeitz2015-04-031-0/+1
| |
* | 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
* | 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 with merge merge mergeMatthew Wild2015-03-272-1/+6
|\ \
| * \ Merge with mergeKim Alvefur2015-03-271-18/+11
| |\ \
| | * | Merge 0.9->0.10Matthew Wild2015-03-268-27/+207
| | |\|
| * | | Merge 0.9->0.10 againKim Alvefur2015-03-277-4/+181
| |\ \ \ | | |/ / | |/| / | | |/
* | | Merge 0.9->0.10 (third time lucky)Matthew Wild2015-03-277-5/+177
|\ \ \ | |/ / |/| / | |/
| * Tagging 0.9.8Matthew Wild2015-03-240-0/+0
| |
| * mod_s2s: to/from attributes are required on s2s stream headers. Set them to ↵0.9.8Matthew Wild2015-03-241-1/+1
| | | | | | | | '' when not available. Fixes #468.
| * sessionmanager: Return 'not-allowed' error instead of the non-existent ↵Matthew Wild2015-03-241-1/+1
| | | | | | | | 'already-bound' error when client tries to bind a resource twice on the same stream (thanks Flow) fixes issue #484.
| * mod_http: Return a static string from module:http_url() when no ports are ↵Kim Alvefur2015-03-231-0/+2
| | | | | | | | enabled and log a warning
| * mod_http: Log a debug message when adding new http apps and warn if no http ↵Kim Alvefur2015-03-231-0/+6
| | | | | | | | ports are enabled
| * Backout 7726b627c3eaKim Alvefur2015-03-231-1/+0
| |
| * utf8_sequences.txt: OopsMatthew Wild2015-03-231-1/+1
| |
| * tests: Add UTF-8 validity testsMatthew Wild2015-03-233-0/+72
| |
| * Merge with ZashMatthew Wild2015-03-232-1/+2
| |\
| | * mod_http: Log event name when adding a HTTP app's hooksMatthew Wild2015-03-141-0/+1
| | |
| | * net.http.server: Log event name when firing a request eventMatthew Wild2015-03-141-1/+1
| | |
| * | util.encodings: Expose UTF-8 validation and length checking functionsKim Alvefur2015-03-231-0/+28
| | |
| * | util.encodings: Perform validation of UTF-8 strings before passing to libidn ↵Kim Alvefur2015-03-231-3/+67
| |/ | | | | | | (Based on code from the utf8 library in Lua 5.3)
* | prosodyctl: Expand plugin paths and attempt to identify prosody-modules ↵Kim Alvefur2015-01-211-1/+14
| | | | | | | | checkouts
* | prosodyctl: Use util.mercurial to identify hg repository and revisionKim Alvefur2015-01-211-1/+4
| |
* | util.mercurial: Utility functions for Mercurial repositoriesKim Alvefur2015-01-211-0/+34
| |
* | prosodyctl: Show relative paths in aboutKim Alvefur2014-07-041-4/+6
| |
* | Backed out 35ebcb733c4cKim Alvefur2015-03-231-1/+0
| |
* | statsmanager: Fire event at the start of collection to allow for pollingKim Alvefur2015-03-101-0/+1
| |
* | Merge 0.9->0.10Matthew Wild2015-02-241-0/+6
|\|
| * configure: Fix for commit cd0088c73daf - update LIBDIR if --prefix is set ↵Matthew Wild2015-02-241-0/+6
| | | | | | | | and --libdir isn't (thanks Medics)
| * mod_admin_telnet: Require util.pposix (fixes #471)Matthew Wild2015-02-201-0/+1
| |
* | statsmanager: Perform an initial collection right after startup is completedKim Alvefur2015-02-221-0/+1
| |
* | Merge 0.9->0.10Kim Alvefur2015-02-214-8/+15
|\|
| * util.datamanager: Check that the global 'prosody' exists before using it ↵Kim Alvefur2015-02-201-1/+1
| | | | | | | | (fixes nil indexing in use outside of prosody)
| * configure, Makefile: Add --libdir option to ./configure, allowing you to ↵Matthew Wild2015-02-203-7/+14
| | | | | | | | override the $PREFIX/lib/ default. Fixes #470.
* | certmanager: Fix compat for MattJs old LuaSec forkKim Alvefur2015-02-051-1/+1
| |