aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge 0.10->trunkKim Alvefur2017-04-255-4/+21
|\
| * util.crand: Build with musl/non-glibc (can't have undefined argument-taking m...Kim Alvefur2017-04-251-0/+4
| * mod_admin_telnet: Output human-friendly memory usage when meminfo is unavaila...Kim Alvefur2017-04-251-1/+1
| * mod_pep: Handle disco#info queries to nodes (fixes #805)Kim Alvefur2017-04-241-1/+11
| * mod_pep: Split long line [luacheck]Kim Alvefur2017-04-241-1/+2
| * util.prosodyctl: Resolve possibly relative pidfile path (fixes inconsistency ...Kim Alvefur2017-04-241-0/+2
| * prosodyctl: Add cert import to short helpKim Alvefur2017-04-241-1/+1
* | Merge 0.10->trunkKim Alvefur2017-04-243-7/+57
|\|
| * prosodyctl: Attempt to reload prosody after importing certificatesKim Alvefur2017-04-221-0/+4
| * prosodyctl: Make note about reporting where certificates are searched forKim Alvefur2017-04-221-0/+1
| * prosodyctl: Return non-zero exit code from cert import if no certificates imp...Kim Alvefur2017-04-221-0/+3
| * prosodyctl: Delay reporting of successful certificate imports until all doneKim Alvefur2017-04-221-2/+6
| * mod_posix: Use typed config APIKim Alvefur2017-04-221-1/+1
| * net.http: Add request.url, which is the original full URL as a stringMatthew Wild2017-04-211-0/+1
| * net.http: Fire new events: pre-request, request-connection-error, request, re...Matthew Wild2017-04-211-1/+19
| * net.http: Allow creation of http client objects, with custom optionsMatthew Wild2017-04-211-3/+22
* | Merge 0.10->trunkKim Alvefur2017-04-211-3/+83
|\|
| * prosodyctl: cert import: Command to copy certificates into prosodys certifica...Kim Alvefur2017-04-211-0/+66
| * prosodyctl: Split long line [luacheck]Kim Alvefur2017-04-211-1/+4
| * prosodyctl: Normalize inconsistent whitespace [luacheck]Kim Alvefur2017-04-211-5/+5
| * prosodyctl: Verify that directory certs are written to existsKim Alvefur2017-04-211-0/+4
| * prosodyctl: Verify permissions on directory that certificates are written toKim Alvefur2017-04-211-0/+8
| * prosodyctl: Return non-zero status to indicate errorKim Alvefur2017-04-211-1/+1
| * prosodyctl: Remove example showing deprecated config optionKim Alvefur2017-04-211-1/+0
| * prosodyctl: Fix indentationKim Alvefur2017-04-211-3/+3
* | Merge 0.10->trunkKim Alvefur2017-04-201-1/+1
|\|
| * prosodyctl: Use the correct variableKim Alvefur2017-04-201-1/+1
* | Merge 0.10->trunkKim Alvefur2017-04-205-12/+24
|\|
| * prosodyctl cert: If running as root, write certificate files to config direct...Kim Alvefur2017-04-191-4/+11
| * prosodyctl: Rename variable for soft-require success to improve readabilityKim Alvefur2017-04-191-2/+2
| * prosodyctl: Remove --root from arg arrayKim Alvefur2017-04-191-1/+3
| * Merge 0.9->0.10Kim Alvefur2017-04-191-1/+3
| |\
| | * mod_bosh: Update session.conn to point to the current connection (fixes #890)Kim Alvefur2017-04-171-1/+3
| * | prosodyctl: Allow continuing to run as root (fixes #893)Kim Alvefur2017-04-191-1/+1
| * | util.sasl.plain,scram: Record username in sasl state earlierKim Alvefur2017-04-192-2/+3
| * | prosodyctl: Don't switch user if we are root and run_as_root is enabledMatthew Wild2017-04-191-1/+1
| * | util.datamanager: Use already known index instead of measuring length each it...Kim Alvefur2017-04-171-2/+2
* | | net.server_epoll: Reset onwritable before calling onconnect (fixes traceback ...Kim Alvefur2017-04-161-2/+2
* | | Merge 0.10->trunkKim Alvefur2017-04-151-0/+5
|\| |
| * | mod_storage_internal: Support the 'key' archive query fieldKim Alvefur2017-04-151-0/+5
* | | Merge 0.10->trunkKim Alvefur2017-04-151-11/+14
|\| |
| * | configure: Skip some interpreter checks if --runwith is setKim Alvefur2017-04-151-10/+13
| * | configure: Fix explanation of where it looked for an interpreter (luarocks 3d...Kim Alvefur2017-04-151-1/+1
* | | Merge 0.10->trunkKim Alvefur2017-04-131-1/+8
|\| |
| * | util.sql: Produce more SQL-standard-like debug messagesKim Alvefur2017-04-131-1/+8
* | | Merge 0.10->trunkKim Alvefur2017-04-131-6/+10
|\| |
| * | mod_storage_sql: Limit encoding check to current databaseKim Alvefur2017-04-131-2/+4
| * | mod_storage_sql: Break long linesKim Alvefur2017-04-121-2/+5
| * | mod_storage_sql: Pass charset and collation names via variable bindingKim Alvefur2017-04-121-4/+3
| * | mod_storage_sql: Quote some field namesKim Alvefur2017-04-121-2/+2