aboutsummaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* Merge 0.10->trunkMatthew Wild2015-01-218-7/+78
|\
| * moduleapi: Module API for statsmanagerMatthew Wild2015-01-211-0/+5
| |
| * statsmanager, util.statistics: API changes, remove debuggingMatthew Wild2015-01-211-11/+3
| |
| * statsmanager, prosody: New core module and API for gathering statistics ↵Matthew Wild2015-01-201-0/+75
| | | | | | | | about the running server
| * storagemanager: Remove unused import of error()Matthew Wild2015-01-201-1/+1
| |
| * sessionmanager: Access bare_session and full_sessions through 'prosody'Matthew Wild2015-01-201-2/+2
| |
| * rostermanager: Access bare_sessions through prosody.bare_sessionsMatthew Wild2015-01-201-1/+1
| |
| * portmanager: Remove unused import of pairs()Matthew Wild2015-01-201-1/+1
| |
| * hostmanager: Remove unused import of util.uuidMatthew Wild2015-01-201-1/+0
| |
| * certmanager: Make global variable access explicitMatthew Wild2015-01-201-1/+1
| |
* | Merge 0.10->trunkKim Alvefur2014-11-221-3/+1
|\|
| * certmanager, mod_tls: Return final ssl config as third return value (fix for ↵Kim Alvefur2014-11-221-3/+1
| | | | | | | | c6caaa440e74, portmanager assumes non-falsy second return value is an error) (thanks deoren)
* | Merge 0.10->trunkKim Alvefur2014-11-201-1/+3
|\|
| * certmanager: Return final ssl config along with ssl context on successKim Alvefur2014-11-191-1/+3
| |
* | hostmanager: Don't prevent host_session.send() from routing errors or iq ↵Matthew Wild2014-09-261-7/+0
| | | | | | | | results, so modules can handle them. This code was originally added for a reason, but I can't remember what it was.
* | Merge 0.10->trunkKim Alvefur2014-09-232-2/+4
|\|
| * core.module{manager,api}: Fix for 010b141e91ed (Thanks v1ct0r)Kim Alvefur2014-09-232-2/+4
| |
* | Merge 0.10->trunkKim Alvefur2014-09-182-4/+8
|\|
| * core.modulemanager, core.moduleapi: Hack around dependency loopKim Alvefur2014-09-172-3/+6
| |
| * core.moduleapi: Use require instead of global to get storagemanager in ↵Kim Alvefur2014-09-171-1/+2
| | | | | | | | module:open_store()
* | Merge 0.10->trunkKim Alvefur2014-09-112-6/+59
|\ \ | |/ |/|
| * Merge 0.10->trunkMatthew Wild2014-08-281-1/+1
| |\
| * | storagemanager: Fix map store shim if store is emptyKim Alvefur2014-08-081-1/+1
| | |
| * | core/storagemanager: When map store isn't available, fallback to keyval storedaurnimator2014-08-071-0/+33
| | |
| * | Merge 0.10->trunkMatthew Wild2014-07-311-0/+5
| |\ \
| * \ \ Merge 0.10->trunkKim Alvefur2014-07-251-1/+1
| |\ \ \
| * \ \ \ Merge 0.10->trunkKim Alvefur2014-07-043-101/+27
| |\ \ \ \
| * \ \ \ \ Merge 0.10->trunkKim Alvefur2014-05-093-38/+12
| |\ \ \ \ \
| * \ \ \ \ \ Merge 0.10->trunkKim Alvefur2014-04-211-8/+9
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge 0.10->trunkKim Alvefur2014-04-201-1/+3
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge 0.10->trunkKim Alvefur2014-04-151-12/+68
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge 0.10->trunkMatthew Wild2014-04-021-1/+3
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge 0.10->trunkKim Alvefur2014-03-251-1/+1
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge 0.10->trunkKim Alvefur2014-02-031-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge 0.10->trunkMatthew Wild2013-11-211-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge 0.10->trunkMatthew Wild2013-11-101-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge 0.10->trunkMatthew Wild2013-11-091-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | core.moduleapi: Fix some global accesses.Waqas Hussain2013-11-061-2/+3
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | core/moduleapi: Return timer object from module:add_timerdaurnimator2013-11-061-5/+24
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | core.sessionmanager: Set a fake thread on destroyed sessions, fixes ↵Kim Alvefur2014-09-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | traceback if stanzas are emitted after a session is destroyed (thanks Sven Blumenstein)
* | | | | | | | | | | | | | | | core.stanza_router, mod_s2s: Move handling of S2S features to mod_s2s from ↵Kim Alvefur2014-09-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stanza_router
* | | | | | | | | | | | | | | | Merge 0.9->0.10Kim Alvefur2014-09-091-21/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | core.stanza_router: Stricter validation of stanzasKim Alvefur2014-09-091-21/+24
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge 0.9->0.10Matthew Wild2014-08-281-1/+1
|\| | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | modulemanager: Reduce warning to debug level message about modules already ↵Kim Alvefur2014-08-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | being loaded, it's probably just module:depends()
* | | | | | | | | | | | | | | Merge 0.9->0.10Matthew Wild2014-07-311-0/+5
|\| | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | configmanager: nameprep VirtualHost and Component namesMatthew Wild2014-07-311-0/+5
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | mod_s2s_auth_certs: Split PKIX based certificate checking from mod_s2s into ↵Kim Alvefur2014-07-251-1/+1
| |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | new plugin
* | | | | | | | | | | | | hostmanager, mod_dialback: Move generation of dialback secret out of coreKim Alvefur2014-05-221-1/+0
| | | | | | | | | | | | |
* | | | | | | | | | | | | core.portmanager: Simplify and take advantage of new ssl config merging in ↵Kim Alvefur2014-07-031-28/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | certmanager