aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* mod_pubsub: Move a comment to where it makes senseKim Alvefur2019-07-101-1/+1
| | | | This code has moved but the comment did not follow it.
* util.error: Fix traceback due to missing text fieldKim Alvefur2019-07-101-1/+1
|
* mod_admin_telnet: Move error handling to thread callback (fixes #1391)Kim Alvefur2019-05-101-7/+4
| | | | Avoids yielding over pcall boundry, fixes xmpp:ping() command on Lua 5.1
* mod_admin_telnet: Check for simple commands before executing in sandboxKim Alvefur2019-05-101-5/+5
| | | | | | This makes fixing yield over pcall boundry issue easier since it would have jumped to the thread error handler instead of proceeding to checking for simple commands.
* mod_pep: Only log when creating new pubsub servicesKim Alvefur2019-07-091-1/+1
| | | | | | | Once upon a time get_pep_service() would get called with random bare JIDs and remote hostnames, which is why it was logged this way. This seems to have been fixed, so it's not as useful anymore. It's still useful to know when it creates a new service object.
* net.http.files: Fix cache handlingKim Alvefur2019-06-291-1/+1
| | | | Typo that broke the LRU-ness of the caching
* prosodyctl: Fix extraction of interpreter from arg when additional arguments ↵Kim Alvefur2019-06-291-1/+9
| | | | | | | (fixes #1386) Interpreter goes into the lowest negative index. See http://www.lua.org/manual/5.2/manual.html#7
* MUC: Advertise language field as such via XEP-0122Kim Alvefur2019-07-071-0/+1
| | | | | | | This lets clients know that the field is a language field and should be in RFC 5646 format. Field validation code in util.dataforms left for future commit.
* mod_pubsub: Expose pubsub#access_model and pubsub#publish_model (fixes #1387)Kim Alvefur2019-07-061-0/+10
|
* Merge 0.11->trunkKim Alvefur2019-07-08108-1337/+3588
|\
| * Merge 0.11->trunkKim Alvefur2019-06-201-1/+1
| |\
| * \ Merge 0.11->trunkKim Alvefur2019-06-201-10/+2
| |\ \
| * | | mod_blocklist: Add comment to clarify some logicKim Alvefur2019-06-201-0/+1
| | | |
| * | | Merge 0.11->trunkKim Alvefur2019-06-202-0/+176
| |\ \ \
| * | | | util.dependencies: Increase Lua version to warn about to 5.4Kim Alvefur2019-06-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No significant problems have been encountered with Lua 5.3 itself, so apart from some odd problems in LuaExpat it seems about time to declare it ready.
| * | | | MUC: Reflow event tables to improve readabilityKim Alvefur2019-06-191-4/+20
| | | | | | | | | | | | | | | | | | | | Also makes it easier to read diffs of added fields.
| * | | | mod_pep: Log node name instead of payloadKim Alvefur2019-06-161-1/+1
| | | | | | | | | | | | | | | | | | | | Having the node logged is more useful and less problematic for privacy
| * | | | Merge 0.11->trunkKim Alvefur2019-06-10107-1377/+3592
| |\ \ \ \
| | * | | | mod_admin_telnet: Collect array from Bosh connections when appending to ↵Michel Le Bihan2019-06-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | connection list Fixes #1356
| | * | | | core/sessionmanager: Remove unnecessary fallback in make_authenticatedMaxime “pep” Buquet2019-06-011-1/+1
| | | | | |
| | * | | | prosody: Also log status code passed to exit()Kim Alvefur2019-05-311-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Sometimes you're just too lazy to `echo $?`
| | * | | | prosody: Log shutdown reason (in past tense) as the very last thingKim Alvefur2019-05-311-1/+1
| | | | | |
| | * | | | prosody: Log shutdown reasonKim Alvefur2019-05-311-0/+1
| | | | | |
| | * | | | Merge 0.11->trunkKim Alvefur2019-05-311-0/+6
| | |\ \ \ \
| | * \ \ \ \ Merge 0.11->trunkKim Alvefur2019-05-301-39/+16
| | |\ \ \ \ \
| | * | | | | | util.format: Handle integer formats the same way on Lua versions without ↵Kim Alvefur2019-05-302-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | integer support
| | * | | | | | util.format: Handle formats expecting an integer in Lua 5.3+ (fixes #1371)Kim Alvefur2019-05-302-0/+7
| | | | | | | |
| | * | | | | | mod_storage_sql: Ignore shadowed error variable [luacheck]Kim Alvefur2019-05-281-1/+1
| | | | | | | |
| | * | | | | | mod_storage_sql: Fix to use correct arguments to archive id lookupKim Alvefur2019-05-281-2/+2
| | | | | | | |
| | * | | | | | mod_storage_sql: Correctly return item-not-found errorKim Alvefur2019-05-281-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `return ok, err` comes out as `transaction_ok, ok, err`
| | * | | | | | Merge 0.11->trunkKim Alvefur2019-05-272-3/+14
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge 0.11->trunkKim Alvefur2019-05-271-1/+1
| | |\ \ \ \ \ \ \
| | * | | | | | | | mod_csi_simple: Disable optimizations on disconnect (fixes #1358)Kim Alvefur2019-05-261-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The connection becomes invalid here, regardless of 3rd party modules that might keep the session alive.
| | * | | | | | | | mod_storage_internal: Return appropriate error even with empty archiveKim Alvefur2019-05-051-0/+3
| | | | | | | | | |
| | * | | | | | | | mod_storage_memory: Return correct error even if no archive data availableKim Alvefur2019-05-051-0/+3
| | | | | | | | | |
| | * | | | | | | | mod_muc_mam: Propagate item-not-found to client (fixes #1325)Kim Alvefur2019-05-051-1/+5
| | | | | | | | | |
| | * | | | | | | | mod_mam: Propagate item-not-found to client (fixes #1325)Kim Alvefur2019-05-051-1/+5
| | | | | | | | | |
| | * | | | | | | | mod_storage_sql: Look up archive IDs in separate queries (fixes #1325)Kim Alvefur2019-03-231-29/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is probably not good for performance.
| | * | | | | | | | mod_storage_memory: Return error if 'before' or 'after' are not found ↵Kim Alvefur2019-03-051-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (partial fix for #1325)
| | * | | | | | | | mod_storage_internal: Return error if 'before' or 'after' are not found ↵Kim Alvefur2019-03-051-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (partial fix for #1325)
| | * | | | | | | | Merge 0.11->trunkKim Alvefur2019-05-263-16/+33
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | configure: Respect previously set paths in macosx presetKim Alvefur2019-05-131-4/+8
| | | | | | | | | | |
| | * | | | | | | | | configure: Remove preset settings that are autodiscoveredKim Alvefur2019-05-131-14/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are likely wrong if other flags have been given.
| | * | | | | | | | | configure: Handle ostype preset after argument processingKim Alvefur2019-05-131-67/+71
| | | | | | | | | | |
| | * | | | | | | | | util.hashring: Add testsMatthew Wild2019-05-131-0/+85
| | | | | | | | | | |
| | * | | | | | | | | util.encodings: Declare absence of arguments [-Wstrict-prototypes]Kim Alvefur2019-05-131-1/+1
| | | | | | | | | | |
| | * | | | | | | | | util.hashring: Implementation of hashring data structureMatthew Wild2019-05-131-0/+88
| | | | | | | | | | |
| | * | | | | | | | | migrator: Add support for archives (fixes #651)Kim Alvefur2019-05-051-0/+6
| | | | | | | | | | |
| | * | | | | | | | | migrator: Rewrite to use storage modulesKim Alvefur2019-05-057-439/+143
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows migrating to and from any storage module that supports the right methods. Based on experimental mod_migrate work.
| | * | | | | | | | | mod_storage_sql: Add support for iterating over users in archive storesKim Alvefur2019-05-051-0/+13
| | | | | | | | | | |