aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | | | | | | | | | | | Merge 0.11->trunkMatthew Wild2019-03-141-0/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | net.server_epoll: Optimize timer handlingKim Alvefur2019-03-121-53/+30
| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | mod_tls: Restore querying for certificates on s2sKim Alvefur2019-03-112-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The 'ssl_config' setting in the mod_s2s network service is not used. Only direct TLS ports use this currently.
| | * | | | | | | | | | | | | | | | | | | net.server: Only add alternate SNI contexts if at least one is providedKim Alvefur2019-03-113-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes use of <starttls/> when a client sends SNI, which would send no certificate otherwise.
| | * | | | | | | | | | | | | | | | | | | core.certmanager: Do not ask for client certificates by defaultKim Alvefur2019-03-103-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since it's mostly only mod_s2s that needs to request client certificates it makes some sense to have mod_s2s ask for this, instead of having eg mod_http ask to disable it.
| | * | | | | | | | | | | | | | | | | | | net.server_select: SNI support (#409)Kim Alvefur2019-03-101-0/+10
| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | net.server_event: Add SNI support (#409)Kim Alvefur2019-03-101-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Snippet adapted from server_epoll
| | * | | | | | | | | | | | | | | | | | | core.portmanager: Collect per-host certificates for SNIKim Alvefur2018-09-141-0/+41
| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | core.portmanager: Record TLS config for each portKim Alvefur2018-10-101-2/+4
| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | net.server_epoll: Add support for SNI (#409)Kim Alvefur2019-03-101-0/+8
| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | doc/net.server: Document the new server.listen() APIKim Alvefur2019-03-101-0/+21
| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Merge 0.11->trunkKim Alvefur2019-03-043-2/+55
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | mod_muc_mam: Validate that the FORM_TYPE of a query is as expectedKim Alvefur2019-03-041-1/+6
| | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge 0.11->trunkKim Alvefur2019-03-021-1/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | core.portmanager: Reduce scope of variableKim Alvefur2018-10-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not sure why it was all the way out there, seems like there would have been unexpected behaviour from that
| | * | | | | | | | | | | | | | | | | | | | | core.portmanager: Use server.listen APIKim Alvefur2018-09-131-1/+5
| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | net.server: New API for creating server listenersKim Alvefur2018-09-133-18/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | server.listen(interface, port, listeners, options);
| | * | | | | | | | | | | | | | | | | | | | | Merge 0.11->trunkKim Alvefur2019-02-272-31/+253
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | MUC: Fire an event to allow affecting decision of whether to allow a role changeKim Alvefur2019-02-241-0/+12
| | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | MUC: Factor out role change permission check into its own methodKim Alvefur2019-02-241-18/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I would like to invert this logic so that it checks if the role change is allowed instead of checking if it is not allowed as it does now, in order to make it easier to understand.
| | * | | | | | | | | | | | | | | | | | | | | | Merge 0.11->trunkKim Alvefur2019-02-222-2/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | prosodyctl: about: Report the current operating system according to unameKim Alvefur2018-12-081-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | net.server_epoll: Increase send_timeout to 3 minutes (to match server_event)Kim Alvefur2019-02-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The separate connect_timeout means we can afford a longer send_timeout
| | * | | | | | | | | | | | | | | | | | | | | | | net.server_epoll: Separate timeout for initial connection attemptsKim Alvefur2019-02-091-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | server_event has this separation already
| | * | | | | | | | | | | | | | | | | | | | | | | Merge 0.11->trunkKim Alvefur2019-02-091-5/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge 0.11->trunkMatthew Wild2019-02-041-3/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge 0.11->trunkKim Alvefur2019-01-283-11/+53
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge 0.11->trunkKim Alvefur2019-01-261-23/+79
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | GNUmakefile: Stop Prosody in case of failure in integration-testKim Alvefur2019-01-241-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Normally make skips the remaning steps in the rule if one fails. This collects the status code and re-returns it after stopping the running Prosody instance.
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge 0.11->trunkKim Alvefur2019-01-220-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | 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_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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge 0.11->trunkKim Alvefur2019-01-172-8/+7
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.