aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge 0.10->trunkMatthew Wild2015-02-245-8/+22
|\
| * 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.
* | | MergeMatthew Wild2015-02-231-21/+34
|\ \ \
| * | | Merge 0.10->trunkKim Alvefur2015-02-093-22/+45
| |\| |
| | * | certmanager: Fix compat for MattJs old LuaSec forkKim Alvefur2015-02-051-1/+1
| | | |
| | * | certmanager: Fix previous commitKim Alvefur2015-02-051-1/+1
| | | |
| | * | certmanager: Limit certificate chain depth to 9Kim Alvefur2015-02-051-0/+1
| | | |
| | * | certmanager: Options that appear to be available since LuaSec 0.2Kim Alvefur2015-02-051-3/+3
| | | |
| | * | certmanager: Improve "detection" of features that depend on LuaSec versionKim Alvefur2015-02-051-11/+15
| | | |
| | * | certmanager: Add locals for ssl.context and ssl.x509Kim Alvefur2015-02-051-3/+5
| | | |
| | * | certmanager: Early return from the entire module if LuaSec is unavailableKim Alvefur2015-02-051-12/+18
| | | |
* | | | Merge 0.10->trunkMatthew Wild2015-01-312-1/+11
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge with 0.10Matthew Wild2015-01-311-0/+10
| |\ \
| | * | sessionmanager: Add pre-resource-bind event that would let plugins have a ↵Kim Alvefur2015-01-301-0/+10
| | | | | | | | | | | | | | | | say in resource binding
| * | | util.statistics: Return 0 as percentile if data out of rangeMatthew Wild2015-01-301-1/+1
| |/ /
* | | Merge 0.10->trunkKim Alvefur2015-01-261-1/+1
|\| |
| * | Merge 0.9->0.10Kim Alvefur2015-01-261-1/+1
| |\|
| | * stanza_router: Fix routing of 'error' IQs with multiple childs (thanks Pawel)Kim Alvefur2015-01-061-1/+1
| | |
* | | Merge 0.10->trunkMatthew Wild2015-01-2113-17/+370
|\| |
| * | moduleapi: Module API for statsmanagerMatthew Wild2015-01-211-0/+5
| | |
| * | statsmanager, util.statistics: API changes, remove debuggingMatthew Wild2015-01-212-35/+56
| | |
| * | statsmanager, prosody: New core module and API for gathering statistics ↵Matthew Wild2015-01-202-0/+76
| | | | | | | | | | | | about the running server
| * | util.statistics: New library for gathering various kinds of statisticsMatthew Wild2015-01-201-0/+131
| | |
| * | 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
| | |
| * | mod_carbons: Import XEP-0280 implementation from prosody-modules (sans ↵Kim Alvefur2015-01-161-0/+111
| | | | | | | | | | | | compat with older versions of the protocol)
| * | util.hex: Pedantic optimization, 1 table lookup per byte instead of 3 ↵Kim Alvefur2015-01-121-7/+13
| | | | | | | | | | | | function calls makes it go faster
| * | mod_pep: Fire an event when an item is publishedKim Alvefur2014-12-201-3/+7
| | |
* | | net.server_select: Remove unused codedaurnimator2015-01-191-6/+0
| | |
* | | net.server_select: Remove socket.sleep call from main loopdaurnimator2015-01-191-8/+0
| | | | | | | | | | | | | | | | | | It's been there since the start; but should really not be required. People can remember an issue with FreeBSD that this solved, but this was a hack solution anyway. If that issue rears it's head again, we will solve it properly.
* | | net.server_select: Remove do-nothing os_difftime callsdaurnimator2015-01-191-5/+3
| | |
* | | net.server_select: In add_task timer callback, use passed in time rather ↵daurnimator2015-01-151-2/+1
| | | | | | | | | | | | than re-fetching
* | | net.server_select: Fix timers not being fired until another timer fixes (or ↵daurnimator2015-01-151-16/+8
| | | | | | | | | | | | 1 second passes)
* | | net.cqueues: Fix incorrect version checkdaurnimator2015-01-161-1/+1
| | |
* | | net.cqueues: Fixes hardcoded timeout for first iterationdaurnimator2015-01-131-11/+16
| | | | | | | | | | | | | | | This was originally put in place as a fix for what ended up a cqueues bug: https://github.com/wahern/cqueues/issues/40 A check for a cqueues version with the bug fix is included.
* | | net.cqueues: Add workaround for luaevent callback getting collecteddaurnimator2015-01-061-1/+5
| | |
* | | mod_muc: Add muc-add-history event to allow modules to override default ↵Matthew Wild2015-01-061-1/+8
| | | | | | | | | | | | history storage
* | | Merge 0.10 -> trunkWaqas Hussain2014-12-167-7/+18
|\| |
| * | mod_admin_telnet: Use the session-specific print functionKim Alvefur2014-12-131-0/+1
| | |
| * | mod_storage_sql2, util.sql: Set character encoding on every connectKim Alvefur2014-12-112-2/+1
| | |