Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 0.10->trunk | Matthew Wild | 2014-07-25 | 2 | -0/+2 |
|\ | |||||
| * | Merge 0.9->0.10 | Matthew Wild | 2014-07-25 | 2 | -0/+2 |
| |\ | |||||
| | * | net.server_select/event: Switch sender mode to *a when reading, to make sure ↵ | Matthew Wild | 2014-07-25 | 2 | -0/+2 |
| | | | | | | | | | | | | we get all available data | ||||
* | | | Merge 0.10->trunk | Matthew Wild | 2014-07-25 | 2 | -11/+8 |
|\| | | |||||
| * | | Merge 0.9->0.10 | Matthew Wild | 2014-07-25 | 2 | -11/+8 |
| |\| | |||||
| | * | mod_admin_telnet: Fix dns:(add,set)nameservers() | Kim Alvefur | 2014-07-25 | 1 | -2/+2 |
| | | | |||||
| | * | net.dns: Remove unused obsolete code | Matthew Wild | 2014-07-25 | 1 | -4/+1 |
| | | | |||||
| | * | net.dns: Ensure all pending requests get notified of a timeout when looking ↵ | Matthew Wild | 2014-07-25 | 1 | -5/+5 |
| | | | | | | | | | | | | up a record (fix for d122420542fb) | ||||
* | | | util.vcard: Add support for uri types in vcard4 | Kim Alvefur | 2014-07-09 | 1 | -0/+2 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2014-07-09 | 1 | -1/+1 |
|\| | | |||||
| * | | mod_dialback: Respect dwd config option | Kim Alvefur | 2014-07-09 | 1 | -1/+1 |
| | | | |||||
* | | | mod_pep_plus: Only broadcast newly added subscriptions | Kim Alvefur | 2014-07-08 | 1 | -9/+26 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2014-07-04 | 12 | -133/+170 |
|\| | | |||||
| * | | mod_dialback.lua: Only check certificates on secure connections | Kim Alvefur | 2014-07-04 | 1 | -6/+8 |
| | | | |||||
| * | | mod_lastactivity, mod_legacyauth, mod_presence, mod_saslauth, mod_tls: Use ↵ | Kim Alvefur | 2014-07-04 | 6 | -12/+13 |
| | | | | | | | | | | | | the newer stanza:get_child APIs and optimize away some table lookups | ||||
| * | | mod_dialback: Short-circuit dialback auth if certificate is considered valid | Kim Alvefur | 2014-07-04 | 2 | -1/+11 |
| | | | |||||
| * | | mod_dialback: Keep the same dialback secret across module reloads | Kim Alvefur | 2014-07-03 | 1 | -1/+9 |
| | | | |||||
| * | | hostmanager, mod_dialback: Move generation of dialback secret out of core | Kim Alvefur | 2014-05-22 | 2 | -2/+4 |
| | | | |||||
| * | | Merge 0.9->0.10 | Kim Alvefur | 2014-07-04 | 0 | -0/+0 |
| |\| | |||||
| | * | mod_register: get_child_text! (thanks Lloyd) | Kim Alvefur | 2014-07-03 | 1 | -2/+2 |
| | | | |||||
| * | | mod_tls: Simplify and use new ssl config merging in certmanager | Kim Alvefur | 2014-07-03 | 1 | -15/+17 |
| | | | |||||
| * | | core.portmanager: Simplify and take advantage of new ssl config merging in ↵ | Kim Alvefur | 2014-07-03 | 1 | -28/+9 |
| | | | | | | | | | | | | certmanager | ||||
| * | | core.certmanager: Make create_context() support an arbitrary number of ↵ | Kim Alvefur | 2014-07-03 | 1 | -3/+6 |
| | | | | | | | | | | | | option sets, merging all | ||||
| * | | core.certmanager: Use util.sslconfig | Kim Alvefur | 2014-07-03 | 1 | -71/+14 |
| | | | |||||
| * | | util.sslconfig: Add lib to deal with LuaSec SSL context configs | Kim Alvefur | 2014-07-03 | 1 | -0/+87 |
| | | | |||||
| * | | mod_presence: Move presence/initial event to correct place so it actually fires | Kim Alvefur | 2014-07-03 | 1 | -3/+1 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2014-06-30 | 2 | -1/+9 |
|\| | | |||||
| * | | Merge 0.9->0.10 | Kim Alvefur | 2014-06-30 | 2 | -1/+9 |
| |\| | |||||
| | * | net.dns: Fix duplicated cache insertions by limiting outstanding queries per ↵ | Kim Alvefur | 2014-06-30 | 1 | -1/+8 |
| | | | | | | | | | | | | name to one | ||||
| | * | net.adns: Add missing local declaration | Kim Alvefur | 2014-06-25 | 1 | -0/+1 |
| | | | |||||
* | | | net/server_*: Fix addclient: LuaSocket 3.0-rc1 sometimes returns EALREADY ↵ | daurnimator | 2014-06-25 | 2 | -2/+2 |
| | | | | | | | | | | | | instead of EINPROGRESS when the dns lookup has multiple results | ||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2014-06-21 | 6 | -20/+30 |
|\| | | |||||
| * | | Merge 0.9->0.10 | Kim Alvefur | 2014-06-21 | 1 | -14/+13 |
| |\| | |||||
| | * | tools/ejabberd2prosody.lua: Fix JID building, node-less jids became ↵ | Kim Alvefur | 2014-06-17 | 1 | -14/+13 |
| | | | | | | | | | | | | @hostname in some cases | ||||
| | * | mod_c2s: Fix traceback if c2s stream sent to component | Kim Alvefur | 2014-05-10 | 1 | -1/+1 |
| | | | |||||
| * | | mod_storage_{none,internal,sql}: Return error for unsupported (everything ↵ | Kim Alvefur | 2014-06-20 | 3 | -5/+11 |
| | | | | | | | | | | | | but keyval) store types | ||||
| * | | mod_storage_sql2: Don't ignore failure in keyval_store:get() (thanks ↵ | Kim Alvefur | 2014-06-20 | 1 | -1/+3 |
| | | | | | | | | | | | | daurnimator) | ||||
| * | | mod_presence: Fire a presence/initial event on initial presence | Kim Alvefur | 2014-06-20 | 1 | -0/+3 |
| | | | |||||
* | | | plugins/muc/muc: Fire broadcast presences event before creating full/anon ↵ | daurnimator | 2014-06-17 | 1 | -11/+13 |
| | | | | | | | | | | | | presences | ||||
* | | | plugins/muc: Fix use of incorrect event on occupant join | daurnimator | 2014-06-17 | 3 | -4/+7 |
| | | | |||||
* | | | plugins/muc/mod_muc: fix wrong event for persistence | daurnimator | 2014-06-11 | 1 | -1/+1 |
| | | | |||||
* | | | plugins/muc/muc.lib: Deliver declines to in-room jids correctly | daurnimator | 2014-06-11 | 1 | -1/+5 |
| | | | |||||
* | | | plugins/muc/muc.lib: Don't add invite/decline bodies if they already have one | daurnimator | 2014-06-06 | 1 | -10/+14 |
| | | | |||||
* | | | plugins/muc/muc.lib: Use original decline as template for medated decline | daurnimator | 2014-06-06 | 1 | -2/+4 |
| | | | |||||
* | | | plugins/muc/muc: When forwarding mediated invites; use filtered version of ↵ | daurnimator | 2014-06-05 | 1 | -2/+4 |
| | | | | | | | | | | | | original invite instead of new object | ||||
* | | | plugins/muc: Move 'x' filtering from occupant to util | daurnimator | 2014-06-05 | 2 | -14/+17 |
| | | | |||||
* | | | mod_admin_telnet: Update muc:room(jid) and muc:list(host) to use the new MUC API | Waqas Hussain | 2014-06-05 | 1 | -3/+3 |
| | | | |||||
* | | | plugins/muc/muc.lib: Fix incorrect whois logic (thanks mva) | daurnimator | 2014-06-01 | 1 | -3/+3 |
| | | | |||||
* | | | plugins/muc/muc.lib: Fix whois check when broadcasting occupant presence | Waqas Hussain | 2014-06-01 | 1 | -1/+1 |
| | | | |||||
* | | | Merge with daurnimator | Waqas Hussain | 2014-05-30 | 1 | -0/+3 |
|\ \ \ |