aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge 0.9->0.10Matthew Wild2015-11-172-5/+11
|\
| * muc.lib: Fix pattern so that it doesn't match hashes containing null bytes, ↵Matthew Wild2015-11-171-1/+1
| | | | | | | | causing dropped stanzas (thanks Jitsi folk!)
| * cert/openssl.cnf: Split CSR and self-signed extensions into separate ↵Kim Alvefur2015-11-091-4/+10
| | | | | | | | sections (see d2d7ad2563f9)
* | prosody: Fix sleep call that relied on the no longer existing socket globalKim Alvefur2015-11-161-1/+3
| |
* | mod_tls: Fix ssl option fallback to a "parent" host if current host does not ↵Kim Alvefur2015-11-091-2/+2
| | | | | | | | have ssl options set (thanks 70b1)
* | mod_tls: Remove unused reference to global ssl config option (certmanager ↵Kim Alvefur2015-11-091-1/+0
| | | | | | | | adds that to the context)
* | mod_s2s/s2sout: Keep SRV lookup response around even if it's emptyKim Alvefur2015-11-051-2/+3
| |
* | sessionmanager: Demote write error to debug messageKim Alvefur2015-11-051-1/+1
| |
* | sessionmanager: Clarify log message when failing to write data to connectionKim Alvefur2015-11-041-3/+2
| |
* | prosodyctl: check: Don't complain about c2s_ssl or s2s_ssl being in ↵Kim Alvefur2015-10-211-1/+1
| | | | | | | | VirtualHost sections, that's supported
* | mod_component: Add config option for deciding what happens if a component ↵Kim Alvefur2015-10-211-3/+11
| | | | | | | | connects while already connected (fixes #525)
* | util.queue: Add luacheck annotationsMatthew Wild2015-10-181-1/+2
| |
* | util.queue: Add :items() iteratorMatthew Wild2015-10-181-0/+13
| |
* | statsmanager: Add get() methodMatthew Wild2015-10-181-0/+3
| |
* | Merge 0.9->0.10Kim Alvefur2015-10-171-1/+1
|\|
| * Makefile: Use more specific globbing for core directory in Makefile (Thanks ↵Kim Alvefur2015-10-141-1/+1
| | | | | | | | Robert Scheck) (fixes #532)
* | Merge 0.9->0.10Kim Alvefur2015-10-111-3/+7
|\|
| * util.openssl: Separate extension sections into one for self-signed certs and ↵Kim Alvefur2015-10-111-3/+7
| | | | | | | | one for requests
* | core.certmanager: Remove non-string filenames (allows setting eg capath to ↵Kim Alvefur2015-10-111-0/+2
| | | | | | | | false to disable the built in default)
* | mod_s2s: Fire global event for stream features where the remote server has ↵Kim Alvefur2015-10-111-0/+1
| | | | | | | | not sent the 'to' stream attribute
* | net.websocket.frames: Fix syntax error due to code copy pastingKim Alvefur2015-10-061-2/+2
| |
* | net.websocket.frames: Use struct packing in Lua 5.3 or struct lib if availableKim Alvefur2015-10-061-0/+25
| |
* | net.websocket.frames: Pack and unpack 64bit ints without overflows ↵Kim Alvefur2015-10-061-4/+6
| | | | | | | | (lua-bitop/bit32 are 32bit)
* | net.websocket.frames: Link to documentation when bitop is missingKim Alvefur2015-10-061-1/+1
| |
* | net.websocket.frames: Throw an error if no bit lib is foundKim Alvefur2015-10-061-2/+2
| |
* | net.websocket.frames: Simplify import of bitlibKim Alvefur2015-10-061-3/+1
| |
* | mod_websocket: Silence luacheck warningsKim Alvefur2015-10-061-1/+2
| |
* | mod_websocket: Import util.timer and session close timeout config option ↵Kim Alvefur2015-10-061-0/+2
| | | | | | | | (thanks fairuz)
* | util.jid: Fix backoutKim Alvefur2015-10-021-1/+1
| |
* | Backout 7e820979fd9b (broke tests)Kim Alvefur2015-10-021-1/+5
| |
* | Merge 0.9->0.10Kim Alvefur2015-09-271-2/+2
|\|
| * mod_http_files: Translate forward slashes to local directory separatorsKim Alvefur2015-09-261-1/+1
| |
| * mod_http_files: Strip trailing directory separator regardless of ↵Kim Alvefur2015-09-261-1/+1
| | | | | | | | directionality of the slash (fixes #545)
* | configure,util-src/Makefile: Make a variable that includes -l for OpenSSL ↵Kim Alvefur2015-09-272-2/+4
| | | | | | | | (like with IDNA_LIBS)
* | Makefile: Use hypen to tell Make when to ignore errorsKim Alvefur2015-09-271-2/+2
| |
* | Makefile: Support generating prosody.version from hg archive metadata fileKim Alvefur2015-09-271-0/+3
| |
* | Makefile: Simplify generation of prosody.version using magic Make magicKim Alvefur2015-09-271-5/+10
| |
* | util-src/Makefile: Remove redundant variables (set in config.unix already)Kim Alvefur2015-09-271-8/+0
| |
* | util-src/Makefile: Don't make exceptions for how to build .so for ↵Kim Alvefur2015-09-271-4/+2
| | | | | | | | util.hashes and util.encodings
* | util-src/Makefile: Tell Make how to build .so from .o in a modern way (Let ↵Kim Alvefur2015-09-271-6/+2
| | | | | | | | built-in rules handle .o)
* | util-src/Makefile: Move Lua include path into CFLAGS variableKim Alvefur2015-09-271-2/+2
| |
* | configure, util-src/Makefile: Move OS X deployment flag to an C compiler ↵Kim Alvefur2015-09-262-3/+1
| | | | | | | | argument set by configure
* | util-src/Makefile: Use variables for install binary and target directoryKim Alvefur2015-09-261-1/+4
| |
* | util-src/Makefile: Move list of .so files in a variableKim Alvefur2015-09-261-6/+6
| |
* | mod_posix: Detect failure to load util.signal by first pcall return value ↵Kim Alvefur2015-09-261-3/+3
| | | | | | | | not by type of the second
* | mod_posix: Normalize indentationKim Alvefur2015-09-261-19/+19
| |
* | Merge 0.9->0.10Kim Alvefur2015-09-251-3/+3
|\|
| * xep227toprosody: Pass parser to callbacks (needed since addition of stanza ↵Kim Alvefur2015-09-181-3/+3
| | | | | | | | size limits)
* | MergeKim Alvefur2015-09-252-3/+17
|\ \
| * | Merge 0.9->0.10Matthew Wild2015-09-252-3/+17
| |\|