aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* mod_muc: Import util.stanza into the config handler modules that need it. ↵Matthew Wild2014-08-053-0/+6
| | | | Fixes #432.
* mod_muc: Fix use of undefined global. Fixes #431.Matthew Wild2014-08-051-1/+2
|
* Merge 0.10->trunkMatthew Wild2014-07-312-4/+7
|\
| * Merge 0.9->0.10Matthew Wild2014-07-312-4/+7
| |\
| | * prosodyctl: Remove nonsensical warningMatthew Wild2014-07-311-1/+0
| | |
| | * prosodyctl: Improve JID splitting and normalization for adduser/passwd/deluserMatthew Wild2014-07-311-3/+5
| | |
| | * configmanager: nameprep VirtualHost and Component namesMatthew Wild2014-07-311-0/+5
| | |
* | | Merge 0.10->trunkKim Alvefur2014-07-253-36/+47
|\ \ \
| * | | mod_s2s: Remove unused localsKim Alvefur2014-07-251-2/+0
| |/ /
| * | mod_s2s_auth_certs: Pick a logging function once and stick with itKim Alvefur2014-07-251-4/+5
| | |
| * | mod_s2s_auth_certs: Split PKIX based certificate checking from mod_s2s into ↵Kim Alvefur2014-07-253-34/+46
| | | | | | | | | | | | new plugin
* | | mod_muc/muc.lib: Remove is_anonymous from event (fix for ec57067c1e0d)Matthew Wild2014-07-251-2/+2
| | |
* | | mod_muc/muc.lib: Pass all info to muc-broadcast-presence handlers that would ↵Matthew Wild2014-07-251-1/+5
| | | | | | | | | | | | be required to use room:build_item_list() - useful for plugins
* | | Merge 0.10->trunkMatthew Wild2014-07-252-0/+2
|\| |
| * | Merge 0.9->0.10Matthew Wild2014-07-252-0/+2
| |\|
| | * net.server_select/event: Switch sender mode to *a when reading, to make sure ↵Matthew Wild2014-07-252-0/+2
| | | | | | | | | | | | we get all available data
* | | Merge 0.10->trunkMatthew Wild2014-07-252-11/+8
|\| |
| * | Merge 0.9->0.10Matthew Wild2014-07-252-11/+8
| |\|
| | * mod_admin_telnet: Fix dns:(add,set)nameservers()Kim Alvefur2014-07-251-2/+2
| | |
| | * net.dns: Remove unused obsolete codeMatthew Wild2014-07-251-4/+1
| | |
| | * net.dns: Ensure all pending requests get notified of a timeout when looking ↵Matthew Wild2014-07-251-5/+5
| | | | | | | | | | | | up a record (fix for d122420542fb)
* | | util.vcard: Add support for uri types in vcard4Kim Alvefur2014-07-091-0/+2
| | |
* | | Merge 0.10->trunkKim Alvefur2014-07-091-1/+1
|\| |
| * | mod_dialback: Respect dwd config optionKim Alvefur2014-07-091-1/+1
| | |
* | | mod_pep_plus: Only broadcast newly added subscriptionsKim Alvefur2014-07-081-9/+26
| | |
* | | Merge 0.10->trunkKim Alvefur2014-07-0412-133/+170
|\| |
| * | mod_dialback.lua: Only check certificates on secure connectionsKim Alvefur2014-07-041-6/+8
| | |
| * | mod_lastactivity, mod_legacyauth, mod_presence, mod_saslauth, mod_tls: Use ↵Kim Alvefur2014-07-046-12/+13
| | | | | | | | | | | | the newer stanza:get_child APIs and optimize away some table lookups
| * | mod_dialback: Short-circuit dialback auth if certificate is considered validKim Alvefur2014-07-042-1/+11
| | |
| * | mod_dialback: Keep the same dialback secret across module reloadsKim Alvefur2014-07-031-1/+9
| | |
| * | hostmanager, mod_dialback: Move generation of dialback secret out of coreKim Alvefur2014-05-222-2/+4
| | |
| * | Merge 0.9->0.10Kim Alvefur2014-07-040-0/+0
| |\|
| | * mod_register: get_child_text! (thanks Lloyd)Kim Alvefur2014-07-031-2/+2
| | |
| * | mod_tls: Simplify and use new ssl config merging in certmanagerKim Alvefur2014-07-031-15/+17
| | |
| * | core.portmanager: Simplify and take advantage of new ssl config merging in ↵Kim Alvefur2014-07-031-28/+9
| | | | | | | | | | | | certmanager
| * | core.certmanager: Make create_context() support an arbitrary number of ↵Kim Alvefur2014-07-031-3/+6
| | | | | | | | | | | | option sets, merging all
| * | core.certmanager: Use util.sslconfigKim Alvefur2014-07-031-71/+14
| | |
| * | util.sslconfig: Add lib to deal with LuaSec SSL context configsKim Alvefur2014-07-031-0/+87
| | |
| * | mod_presence: Move presence/initial event to correct place so it actually firesKim Alvefur2014-07-031-3/+1
| | |
* | | Merge 0.10->trunkKim Alvefur2014-06-302-1/+9
|\| |
| * | Merge 0.9->0.10Kim Alvefur2014-06-302-1/+9
| |\|
| | * net.dns: Fix duplicated cache insertions by limiting outstanding queries per ↵Kim Alvefur2014-06-301-1/+8
| | | | | | | | | | | | name to one
| | * net.adns: Add missing local declarationKim Alvefur2014-06-251-0/+1
| | |
* | | net/server_*: Fix addclient: LuaSocket 3.0-rc1 sometimes returns EALREADY ↵daurnimator2014-06-252-2/+2
| | | | | | | | | | | | instead of EINPROGRESS when the dns lookup has multiple results
* | | Merge 0.10->trunkKim Alvefur2014-06-216-20/+30
|\| |
| * | Merge 0.9->0.10Kim Alvefur2014-06-211-14/+13
| |\|
| | * tools/ejabberd2prosody.lua: Fix JID building, node-less jids became ↵Kim Alvefur2014-06-171-14/+13
| | | | | | | | | | | | @hostname in some cases
| | * mod_c2s: Fix traceback if c2s stream sent to componentKim Alvefur2014-05-101-1/+1
| | |
| * | mod_storage_{none,internal,sql}: Return error for unsupported (everything ↵Kim Alvefur2014-06-203-5/+11
| | | | | | | | | | | | but keyval) store types
| * | mod_storage_sql2: Don't ignore failure in keyval_store:get() (thanks ↵Kim Alvefur2014-06-201-1/+3
| | | | | | | | | | | | daurnimator)