aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge 0.11->trunkKim Alvefur2019-01-220-0/+0
|\
| * mod_websocket: Log an error if cross_domain_websocket = true is set in a ↵Kim Alvefur2019-01-221-0/+5
| | | | | | | | VirtualHost section
* | core.statsmanager: Do a final collection on shutdownKim Alvefur2019-01-221-0/+1
| |
* | TODO: Remove statistics since this was done in 0.10Kim Alvefur2019-01-211-1/+0
| |
* | mod_mam: Fix operator precedence (thanks mimi89999)Kim Alvefur2019-01-201-1/+1
| |
* | Merge 0.11->trunkKim Alvefur2019-01-190-0/+0
|\|
| * mod_websocket: Include the value of cross_domain_websocket in debug messageKim Alvefur2019-01-181-1/+1
| |
* | mod_bosh, mod_websocket: Remove accidentally included dependency on ↵Kim Alvefur2019-01-192-2/+0
| | | | | | | | non-existant module
* | prosodyctl: Fix module.command invocation (thanks woffs)Kim Alvefur2019-01-181-2/+0
| | | | | | | | The first argument is already removed once since c7727c13260f
* | mod_http: Determine CORS methods to whitelist from actual methods usedKim Alvefur2019-01-171-2/+9
| |
* | mod_http: Set up to handle OPTIONSKim Alvefur2019-01-181-0/+7
| | | | | | | | | | Lower priority to allow http modules to handle it themselves, should they wish to
* | mod_websocket: Drop CORS code in favor of that in mod_httpKim Alvefur2018-10-042-35/+5
| | | | | | | | | | Like for mod_bosh, deprecates consider_websocket_secure and depend on mod_http_crossdomain if it is set.
* | mod_bosh: Drop CORS code in favor of than in mod_httpKim Alvefur2018-10-042-26/+6
| | | | | | | | | | This deprecates the cross_domain_bosh setting. As a compat measure, if it is set, mod_http_crossdomain is loaded.
* | mod_http: Solve CORS problems once and for allKim Alvefur2018-10-041-0/+19
| | | | | | | | | | | | | | This blindly allows any cross-site requests. Future work should add an API to allow each HTTP app some influence over this for each HTTP path
* | Merge 0.11->trunkKim Alvefur2019-01-171-1/+1
|\|
| * mod_motd: Remove unused variable [luacheck]Kim Alvefur2019-01-171-1/+1
| |
* | Merge 0.11->trunkKim Alvefur2019-01-172-8/+7
|\|
| * mod_motd: Remove redundant conditionsKim Alvefur2019-01-171-8/+6
| | | | | | | | The stanza should always be like this in the presence/initial event
| * mod_presence: Revert empty 'to' attribute of presence before ↵Kim Alvefur2019-01-171-0/+1
| | | | | | | | presence/initial event (fixes #1296)
* | core.s2smanager: Add stub reset_stream method to destroyed sessionsKim Alvefur2019-01-161-0/+3
| | | | | | | | Fixes traceback if connection is closed from the 's2s-authenticated' event
* | mod_admin_telnet: sttas:show: Use format option that allows float numbersKim Alvefur2019-01-161-1/+1
| | | | | | | | string.format("%d", 0.5) causes an error on Lua 5.3
* | util.http: Fix decoding of uppercase URL encoded charsKim Alvefur2019-01-162-0/+6
| | | | | | | | Broken in 1af5106a2c34
* | mod_c2s, mod_s2s, mod_component: Log invalid XML escaped (fixes #734)Kim Alvefur2019-01-153-4/+3
| | | | | | | | See 6ed0d6224d64
* | mod_storage_memory: Implement :user iteration APIKim Alvefur2019-01-141-0/+8
| |
* | prosodyctl: Use the same runtime for starting prosodyKim Alvefur2019-01-101-1/+1
| | | | | | | | Improves the experience with the `make integration-test` command
* | util.prosodyctl: Allow passing path to Lua runtime to the start() functionKim Alvefur2019-01-101-3/+4
| | | | | | | | | | By default the shebang is used. Being able to override it is useful in cases where the shebang does not match the configured runtime.
* | prosodyctl: Pass the original argv table to subcommands (with first argument ↵Kim Alvefur2019-01-101-2/+2
| | | | | | | | | | | | | | removed) This preserves eg arg[-1] where you might find the path to the Lua executable, which can be useful.
* | GNUmakefile: Add target for running scansionKim Alvefur2019-01-101-0/+6
| |
* | Merge 0.11->trunkKim Alvefur2019-01-101-1/+1
|\|
| * mod_bosh: Handle missing wait attribute (fixes #1288)Kim Alvefur2019-01-101-1/+1
| | | | | | | | 250855633092 did not fix this completely.
| * Added tag 0.11.2 for changeset 4f8b6c09e5f3Matthew Wild2019-01-080-0/+0
| |
* | Merge 0.11->trunkMatthew Wild2019-01-070-0/+0
|\|
| * Merge 0.10->0.11Matthew Wild2019-01-070-0/+0
| |\
| | * Added tag 0.10.3 for changeset bb8486491b48Matthew Wild2018-11-280-0/+0
| | |
* | | Merge 0.11->trunkKim Alvefur2019-01-071-2/+17
|\| |
| * | mod_csi_simple: Consider messages encrypted payload as important (fixes part ↵Kim Alvefur2019-01-061-0/+3
| | | | | | | | | | | | of #1250)
| * | mod_csi_simple: Consider messages with subject (eg MUC joins) (fixes part of ↵Kim Alvefur2019-01-061-0/+3
| | | | | | | | | | | | #1250)
| * | mod_csi_simple: Unpack Carbons-forwarded messages (fixes part of #1250)Kim Alvefur2019-01-061-0/+4
| | |
| * | mod_csi_simple: Consider messages forwarded from another of the users ↵Kim Alvefur2019-01-061-0/+3
| | | | | | | | | | | | clients as important (fixes part of #1250)
| * | mod_csi_simple: Tweak check for <body>Kim Alvefur2019-01-061-2/+4
| | | | | | | | | | | | There were code that checked the body for mentions but isn't included.
* | | MUC: Rename import to avoid name clash [luacheck]Kim Alvefur2019-01-061-2/+2
| | |
* | | Merge with jonasKim Alvefur2019-01-061-0/+4
|\ \ \
| * | | MUC: add ID to message if no ID is presentJonas Wielicki2019-01-061-0/+4
| | | |
* | | | Merge 0.11->trunkKim Alvefur2019-01-062-1/+4
|\ \ \ \ | | |/ / | |/| |
| * | | mod_posix: Don't reload logging twiceKim Alvefur2019-01-061-1/+1
| | | | | | | | | | | | | | | | See 18eca6afb367
| * | | util.startup: Always reload logging after config (fixes #1284)Kim Alvefur2019-01-061-0/+3
| | | | | | | | | | | | | | | | | | | | This chancged in 6e24a69b03af likely because of confusion about the `reopen-log-files` event which was fired but never hooked.
* | | | mod_http_errors: Normalize CSSKim Alvefur2019-01-061-11/+14
| | | |
* | | | util.http: Pre-generate urlencoding mappings (optimization)Kim Alvefur2019-01-061-10/+11
| | | | | | | | | | | | | | | | Function calls are more expensive than table lookups
* | | | mod_mam: Handle expiry of messages that expire in the middle of the cut-off dayKim Alvefur2019-01-061-2/+6
| | | |
* | | | mod_mam: Measure how long it takes to run the message expiry job jobKim Alvefur2019-01-061-0/+3
| |/ / |/| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 09:53:55 +0000