aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge 0.10->trunkMatthew Wild2016-03-044-2/+26
|\
| * util.json: Fix encoding of json.null (bug introduced in bf1f09a5bcf7)Matthew Wild2016-03-041-1/+3
| |
| * Makefile: Reduce verbosity of 'make test' so it only shows test failuresMatthew Wild2016-03-041-1/+1
| |
| * Add tests for util.jsonMatthew Wild2016-03-042-0/+22
| |
* | Merge 0.10->trunkKim Alvefur2016-03-032-4/+9
|\|
| * Merge 0.9->0.10Kim Alvefur2016-03-031-3/+8
| |\
| | * mod_http_files: Preserve a trailing / in paths (fixes #639)Kim Alvefur2016-03-031-0/+3
| | |
| | * mod_http_files: Don't prepend / to path twice, sanitize path does this alreadyKim Alvefur2016-03-031-1/+1
| | |
| | * mod_http_files: Fix traceback when serving a non-wildcard path (fixes #611)Kim Alvefur2016-03-031-2/+4
| | |
| * | mod_welcome: Pass default text to config API as default valueKim Alvefur2016-03-021-1/+1
| | |
| * | mod_welcome: Use type-specific config APIKim Alvefur2016-03-021-1/+1
| | |
* | | Merge 0.10->trunkKim Alvefur2016-03-022-7/+9
|\| |
| * | Merge 0.9->0.10Kim Alvefur2016-03-022-525/+527
| |\|
| | * net.server_event: Return true from conn:resume() to indicate successKim Alvefur2016-03-021-0/+1
| | |
| | * net.server_event: Prevent resuming connections without readcallback, eg ↵Kim Alvefur2016-03-021-1/+1
| | | | | | | | | | | | closed connections (fixes #590)
| | * mod_c2s: Remove connection object from session object when connection ↵Kim Alvefur2016-03-021-0/+1
| | | | | | | | | | | | disconnected to prevent accidental use (see #590)
* | | Merge 0.10->trunkKim Alvefur2016-02-281-2/+2
|\| |
| * | util.sasl.scram: Rename variable in places missed in 65e36b81d56a (thanks mt)Kim Alvefur2016-02-281-2/+2
| | |
* | | Merge 0.10->trunkKim Alvefur2016-02-282-8/+6
|\| |
| * | util.sasl.scram: Remove unused initial value [luacheck]Kim Alvefur2016-02-281-1/+1
| | |
| * | util.sasl.scram: Rename variable to avoid name clash [luacheck]Kim Alvefur2016-02-281-5/+5
| | |
| * | util.sasl.anonymous: Remove unused locals [luacheck]Kim Alvefur2016-02-281-2/+0
| | |
* | | Merge 0.10->trunkKim Alvefur2016-02-281-2/+2
|\| |
| * | prosodyctl: One month is 31 days, no 13 (thanks av6)Kim Alvefur2016-02-281-1/+1
| | |
| * | prosodyctl: Fix typo (thanks av6)Kim Alvefur2016-02-281-1/+1
| | |
* | | Merge 0.10->trunkKim Alvefur2016-02-281-9/+16
|\| |
| * | prosodyctl: check certs: Warn about certificate expiry in the near futureKim Alvefur2016-02-281-0/+7
| | |
| * | prosodyctl: check certs: Update messages to account for 'ssl' option maybe ↵Kim Alvefur2016-02-281-2/+2
| | | | | | | | | | | | not existing
| * | prosodyctl: check certs: Use certmanager to get the final ssl config in ↵Kim Alvefur2016-02-281-7/+7
| | | | | | | | | | | | order to support the new certificate(s) config option
* | | Merge 0.10->trunkKim Alvefur2016-02-283-19/+66
|\| |
| * | util.termcolours: Rename loop variable [luacheck]Kim Alvefur2016-02-281-4/+4
| | |
| * | util.termcolours: Validate color codes, fixes tracebackKim Alvefur2016-02-281-2/+7
| | |
| * | util.termcolours: Add some CSS color namesKim Alvefur2016-02-271-0/+12
| | |
| * | util.termcolours: Add 256 color supportKim Alvefur2016-02-271-0/+25
| | |
| * | util.datamanager: Explicit handling of each error condition (see #632)Kim Alvefur2016-02-271-14/+16
| | |
| * | Merge 0.9->0.10Kim Alvefur2016-02-251-0/+1
| |\|
| | * util.datamanager: Unreference file handle after closing it to prevent trying ↵Kim Alvefur2016-02-251-0/+1
| | | | | | | | | | | | to close it again (fixes #632)
| * | util.termcolours: Remove argument from noop function [luacheck]Kim Alvefur2016-02-251-1/+1
| | |
| * | util.termcolours: Silence luacheck warningKim Alvefur2016-02-251-0/+2
| | |
| * | util.template: Use separate variables for source and compiled function ↵Kim Alvefur2016-02-251-4/+4
| | | | | | | | | | | | [luacheck]
| * | util.template: Silence luacheck warnings about unused loop varsKim Alvefur2016-02-251-1/+1
| | |
* | | Merge 0.10->trunkKim Alvefur2016-02-253-22/+38
|\| |
| * | certs/Makefile: Add target for generating DH paramsKim Alvefur2016-02-251-0/+4
| | |
| * | prosodyctl: Allow a DN path to be given to 'cert generate' command (fixes #349)Kim Alvefur2016-02-251-20/+33
| | |
| * | util.openssl: Allow order of distinguished name fields to be included in configKim Alvefur2016-02-251-2/+1
| | |
* | | Merge 0.10->trunkKim Alvefur2016-02-242-1/+2
|\| |
| * | prosodyctl: Create host.sessions table, (needed by 1295e14614f4) (thanks goffi)Kim Alvefur2016-02-241-0/+1
| | |
| * | util.crand: Include stdlib.h instead of malloc.h for portability (thanks Tobias)Kim Alvefur2016-02-221-1/+1
| | |
* | | Merge 0.10->trunkKim Alvefur2016-02-2210-8/+200
|\| |
| * | util.crand: C binding to one of OpenSSL, Linux getrandom() or OpenBSD ↵Kim Alvefur2016-02-224-1/+187
| | | | | | | | | | | | arc4random() CSPRNG
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 08:24:57 +0000