aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge...Kim Alvefur2015-12-031-2/+25
|\
| * MergeKim Alvefur2015-12-031-1/+35
| |\
| * | prosodyctl check: Point out that authentication and storage modules should no...Kim Alvefur2015-12-031-0/+14
| * | prosodyctl check: Point out items in the modules_enabled list that incorrectl...Kim Alvefur2015-12-031-0/+9
| * | prosodyctl check: Really store imported LuaSec (must be a leftover from debug...Kim Alvefur2015-12-031-1/+1
| * | prosodyctl check: Include global options when checking "all options"Kim Alvefur2015-12-031-1/+1
* | | mod_storage_sql2: Remove from trunk (all trunk-only changes backported)Matthew Wild2015-12-031-476/+0
* | | Merge 0.10->trunkMatthew Wild2015-12-031-1/+35
|\ \ \ | | |/ | |/|
| * | mod_storage_sql: Add map store (backported from trunk)Matthew Wild2015-12-031-0/+34
| * | mod_storage_sql: Whitespace fix (backported from trunk)Matthew Wild2015-12-031-1/+1
| |/
* | Merge 0.10->trunkMatthew Wild2015-12-035-316/+778
|\|
| * storagemanager, mod_storage_sql, mod_storage_sql2: Rename mod_storage_sql2 ->...Matthew Wild2015-12-034-750/+766
| * net.http.server: Use new util.cache to remember wildcard event handlersMatthew Wild2015-12-031-5/+5
| * storagemanager: Split config retrieval into its own functionMatthew Wild2015-12-031-2/+6
| * mod_proxy65: Use typed config API (fix issues when options are set to unexpec...Kim Alvefur2015-12-031-2/+2
* | Merge 0.10->trunkMatthew Wild2015-11-266-37/+300
|\|
| * tests: Add tests for util.cacheMatthew Wild2015-11-262-0/+175
| * util.cache: Small update to prefix private fields with an underscore, add a :...Matthew Wild2015-11-261-32/+43
| * mod_blocklist: Use util.cache to manage how many users blocklists are kept in...Kim Alvefur2015-11-251-7/+13
| * util.cache: Make sure cache size is specified as an integerKim Alvefur2015-11-251-0/+2
| * util.pposix: Expose the uname GNU extension field 'domainname'Kim Alvefur2015-11-251-0/+4
| * util.session: How would you even send anything to a session?Kim Alvefur2015-11-241-0/+32
| * util.session: How does a session relate do a connection?Kim Alvefur2015-11-241-0/+7
| * util.session: What does the session say?Kim Alvefur2015-11-241-0/+8
| * util.session: What is the identity of a session?Kim Alvefur2015-11-241-0/+7
| * util.session: What is a session?Kim Alvefur2015-11-241-0/+11
* | mod_admin_telnet: Add timer:info() which shows some basic info about util.timerKim Alvefur2015-11-251-0/+32
* | MergeMatthew Wild2015-11-242-3/+22
|\ \
| * | util.timer: If possible, close the existing timer handle in order to have onl...Kim Alvefur2015-11-221-2/+8
| * | util.timer: Expire timer instance if another instance is already set to take ...Kim Alvefur2015-11-221-2/+11
| * | util.timer: Keep count of how many timer instances are activeKim Alvefur2015-11-221-0/+3
| * | net.server_event: Return event handle from add_task so it can be closed by eg...Kim Alvefur2015-11-221-0/+1
* | | Merge 0.10->trunkMatthew Wild2015-11-241-0/+91
|\ \ \ | |/ / |/| / | |/
| * util.cache: Ordered key->value data structure, with size limit (same as pubsub)Matthew Wild2015-11-241-0/+91
* | Merge 0.10->trunkMatthew Wild2015-11-222-4/+4
|\|
| * mod_admin_telnet: c2s:show(): Add flag to indicate remote sessionsMatthew Wild2015-11-221-0/+3
| * util.ip: Improve comparison, == doesn't necessarily handle IPv6 addresses cor...Matthew Wild2015-11-221-4/+1
* | Merge 0.10->trunkMatthew Wild2015-11-173-6/+14
|\|
| * Merge 0.9->0.10Matthew Wild2015-11-172-5/+11
| |\
| | * muc.lib: Fix pattern so that it doesn't match hashes containing null bytes, c...Matthew Wild2015-11-171-1/+1
| | * cert/openssl.cnf: Split CSR and self-signed extensions into separate sections...Kim Alvefur2015-11-091-4/+10
| * | prosody: Fix sleep call that relied on the no longer existing socket globalKim Alvefur2015-11-161-1/+3
* | | Merge 0.10->trunkKim Alvefur2015-11-097-13/+37
|\| |
| * | mod_tls: Fix ssl option fallback to a "parent" host if current host does not ...Kim Alvefur2015-11-091-2/+2
| * | mod_tls: Remove unused reference to global ssl config option (certmanager add...Kim Alvefur2015-11-091-1/+0
| * | mod_s2s/s2sout: Keep SRV lookup response around even if it's emptyKim Alvefur2015-11-051-2/+3
| * | sessionmanager: Demote write error to debug messageKim Alvefur2015-11-051-1/+1
| * | sessionmanager: Clarify log message when failing to write data to connectionKim Alvefur2015-11-041-3/+2
| * | prosodyctl: check: Don't complain about c2s_ssl or s2s_ssl being in VirtualHo...Kim Alvefur2015-10-211-1/+1
| * | mod_component: Add config option for deciding what happens if a component con...Kim Alvefur2015-10-211-3/+11