Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 0.9->0.10 | Kim Alvefur | 2015-04-26 | 2 | -15/+8 |
|\ | |||||
| * | net.dns, mod_s2s: Add chasing of CNAMEs to net.dns and remove it from mod_s2s | Kim Alvefur | 2015-04-24 | 2 | -15/+8 |
| | | |||||
* | | mod_c2s, mod_s2s: Collect statistics on number of connections | Kim Alvefur | 2015-04-26 | 2 | -0/+8 |
| | | |||||
* | | mod_blocklist: Some cleanup [luacheck] | Kim Alvefur | 2015-04-25 | 1 | -9/+8 |
| | | |||||
* | | usermanager: Capitalize log message | Kim Alvefur | 2015-04-25 | 1 | -1/+1 |
| | | |||||
* | | mod_admin_adhoc: Remove special treatment of the "pending" roster entry | Kim Alvefur | 2015-04-25 | 1 | -2/+2 |
| | | |||||
* | | rostermanager: Fix roster upgrade code (thanks mva) | Kim Alvefur | 2015-04-05 | 1 | -6/+5 |
| | | |||||
* | | rostermanager: Add missing import of `type()` | Florian Zeitz | 2015-04-03 | 1 | -0/+1 |
| | | |||||
* | | util-src/*.c: Per convention call luaL_error() as argument to return | Florian Zeitz | 2015-04-03 | 3 | -5/+6 |
| | | |||||
* | | sessionmanager: Rename parameter to avoid varible name conflict | Matthew Wild | 2015-04-03 | 1 | -2/+2 |
| | | |||||
* | | hostmanager: Rename variable to avoid shadowing 'type()' function | Matthew Wild | 2015-04-03 | 1 | -2/+2 |
| | | |||||
* | | loggingmanager: Improve code structure (removes empty if branch) | Matthew Wild | 2015-04-03 | 1 | -9/+9 |
| | | |||||
* | | rostermanager: Remove unused parameter | Matthew Wild | 2015-04-03 | 1 | -1/+1 |
| | | |||||
* | | util-src/*.c: astyle --indent=tab --brackets=attach --indent-switches ↵ | Kim Alvefur | 2015-04-03 | 7 | -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 Alvefur | 2015-04-03 | 3 | -26/+32 |
| | | | | | | | | metadata field | ||||
* | | prosodyctl: Use ssl.loadcertificate instead of ssl.x509.load, as the ↵ | Kim Alvefur | 2015-04-02 | 1 | -1/+1 |
| | | | | | | | | ssl.x509 export dissapears in 97b1974 or 356e03a | ||||
* | | prosodyctl: Document magic commit ID | Paul Aurich | 2015-04-01 | 1 | -0/+1 |
| | | |||||
* | | util.table, Makefile: New C module that allows pre-allocation of tables to ↵ | Matthew Wild | 2015-03-31 | 2 | -2/+16 |
| | | | | | | | | improve performance and decrease memory fragmentation | ||||
* | | Merge with merge merge merge | Matthew Wild | 2015-03-27 | 2 | -1/+6 |
|\ \ | |||||
| * \ | Merge with merge | Kim Alvefur | 2015-03-27 | 1 | -18/+11 |
| |\ \ | |||||
| | * | | Merge 0.9->0.10 | Matthew Wild | 2015-03-26 | 8 | -27/+207 |
| | |\| | |||||
| * | | | Merge 0.9->0.10 again | Kim Alvefur | 2015-03-27 | 7 | -4/+181 |
| |\ \ \ | | |/ / | |/| / | | |/ | |||||
* | | | Merge 0.9->0.10 (third time lucky) | Matthew Wild | 2015-03-27 | 7 | -5/+177 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | Tagging 0.9.8 | Matthew Wild | 2015-03-24 | 0 | -0/+0 |
| | | |||||
| * | mod_s2s: to/from attributes are required on s2s stream headers. Set them to ↵0.9.8 | Matthew Wild | 2015-03-24 | 1 | -1/+1 |
| | | | | | | | | '' when not available. Fixes #468. | ||||
| * | sessionmanager: Return 'not-allowed' error instead of the non-existent ↵ | Matthew Wild | 2015-03-24 | 1 | -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 Alvefur | 2015-03-23 | 1 | -0/+2 |
| | | | | | | | | enabled and log a warning | ||||
| * | mod_http: Log a debug message when adding new http apps and warn if no http ↵ | Kim Alvefur | 2015-03-23 | 1 | -0/+6 |
| | | | | | | | | ports are enabled | ||||
| * | Backout 7726b627c3ea | Kim Alvefur | 2015-03-23 | 1 | -1/+0 |
| | | |||||
| * | utf8_sequences.txt: Oops | Matthew Wild | 2015-03-23 | 1 | -1/+1 |
| | | |||||
| * | tests: Add UTF-8 validity tests | Matthew Wild | 2015-03-23 | 3 | -0/+72 |
| | | |||||
| * | Merge with Zash | Matthew Wild | 2015-03-23 | 2 | -1/+2 |
| |\ | |||||
| | * | mod_http: Log event name when adding a HTTP app's hooks | Matthew Wild | 2015-03-14 | 1 | -0/+1 |
| | | | |||||
| | * | net.http.server: Log event name when firing a request event | Matthew Wild | 2015-03-14 | 1 | -1/+1 |
| | | | |||||
| * | | util.encodings: Expose UTF-8 validation and length checking functions | Kim Alvefur | 2015-03-23 | 1 | -0/+28 |
| | | | |||||
| * | | util.encodings: Perform validation of UTF-8 strings before passing to libidn ↵ | Kim Alvefur | 2015-03-23 | 1 | -3/+67 |
| |/ | | | | | | | (Based on code from the utf8 library in Lua 5.3) | ||||
* | | prosodyctl: Expand plugin paths and attempt to identify prosody-modules ↵ | Kim Alvefur | 2015-01-21 | 1 | -1/+14 |
| | | | | | | | | checkouts | ||||
* | | prosodyctl: Use util.mercurial to identify hg repository and revision | Kim Alvefur | 2015-01-21 | 1 | -1/+4 |
| | | |||||
* | | util.mercurial: Utility functions for Mercurial repositories | Kim Alvefur | 2015-01-21 | 1 | -0/+34 |
| | | |||||
* | | prosodyctl: Show relative paths in about | Kim Alvefur | 2014-07-04 | 1 | -4/+6 |
| | | |||||
* | | Backed out 35ebcb733c4c | Kim Alvefur | 2015-03-23 | 1 | -1/+0 |
| | | |||||
* | | statsmanager: Fire event at the start of collection to allow for polling | Kim Alvefur | 2015-03-10 | 1 | -0/+1 |
| | | |||||
* | | Merge 0.9->0.10 | Matthew Wild | 2015-02-24 | 1 | -0/+6 |
|\| | |||||
| * | configure: Fix for commit cd0088c73daf - update LIBDIR if --prefix is set ↵ | Matthew Wild | 2015-02-24 | 1 | -0/+6 |
| | | | | | | | | and --libdir isn't (thanks Medics) | ||||
| * | mod_admin_telnet: Require util.pposix (fixes #471) | Matthew Wild | 2015-02-20 | 1 | -0/+1 |
| | | |||||
* | | statsmanager: Perform an initial collection right after startup is completed | Kim Alvefur | 2015-02-22 | 1 | -0/+1 |
| | | |||||
* | | Merge 0.9->0.10 | Kim Alvefur | 2015-02-21 | 4 | -8/+15 |
|\| | |||||
| * | util.datamanager: Check that the global 'prosody' exists before using it ↵ | Kim Alvefur | 2015-02-20 | 1 | -1/+1 |
| | | | | | | | | (fixes nil indexing in use outside of prosody) | ||||
| * | configure, Makefile: Add --libdir option to ./configure, allowing you to ↵ | Matthew Wild | 2015-02-20 | 3 | -7/+14 |
| | | | | | | | | override the $PREFIX/lib/ default. Fixes #470. | ||||
* | | certmanager: Fix compat for MattJs old LuaSec fork | Kim Alvefur | 2015-02-05 | 1 | -1/+1 |
| | |