Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | muc.lib: Fix pattern so that it doesn't match hashes containing null bytes, ↵ | Matthew Wild | 2015-11-17 | 1 | -1/+1 | |
| | | | | | | | | | | | | causing dropped stanzas (thanks Jitsi folk!) | |||||
| | * | cert/openssl.cnf: Split CSR and self-signed extensions into separate ↵ | Kim Alvefur | 2015-11-09 | 1 | -4/+10 | |
| | | | | | | | | | | | | sections (see d2d7ad2563f9) | |||||
| * | | prosody: Fix sleep call that relied on the no longer existing socket global | Kim Alvefur | 2015-11-16 | 1 | -1/+3 | |
| | | | ||||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2015-11-09 | 7 | -13/+37 | |
|\| | | ||||||
| * | | mod_tls: Fix ssl option fallback to a "parent" host if current host does not ↵ | Kim Alvefur | 2015-11-09 | 1 | -2/+2 | |
| | | | | | | | | | | | | have ssl options set (thanks 70b1) | |||||
| * | | mod_tls: Remove unused reference to global ssl config option (certmanager ↵ | Kim Alvefur | 2015-11-09 | 1 | -1/+0 | |
| | | | | | | | | | | | | adds that to the context) | |||||
| * | | mod_s2s/s2sout: Keep SRV lookup response around even if it's empty | Kim Alvefur | 2015-11-05 | 1 | -2/+3 | |
| | | | ||||||
| * | | sessionmanager: Demote write error to debug message | Kim Alvefur | 2015-11-05 | 1 | -1/+1 | |
| | | | ||||||
| * | | sessionmanager: Clarify log message when failing to write data to connection | Kim Alvefur | 2015-11-04 | 1 | -3/+2 | |
| | | | ||||||
| * | | prosodyctl: check: Don't complain about c2s_ssl or s2s_ssl being in ↵ | Kim Alvefur | 2015-10-21 | 1 | -1/+1 | |
| | | | | | | | | | | | | VirtualHost sections, that's supported | |||||
| * | | mod_component: Add config option for deciding what happens if a component ↵ | Kim Alvefur | 2015-10-21 | 1 | -3/+11 | |
| | | | | | | | | | | | | connects while already connected (fixes #525) | |||||
| * | | util.queue: Add luacheck annotations | Matthew Wild | 2015-10-18 | 1 | -1/+2 | |
| | | | ||||||
| * | | util.queue: Add :items() iterator | Matthew Wild | 2015-10-18 | 1 | -0/+13 | |
| | | | ||||||
| * | | statsmanager: Add get() method | Matthew Wild | 2015-10-18 | 1 | -0/+3 | |
| | | | ||||||
* | | | MUC: Reject muc:admin query with missing <item> child | Kim Alvefur | 2015-10-18 | 1 | -0/+3 | |
| | | | ||||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2015-10-17 | 1 | -1/+1 | |
|\| | | ||||||
| * | | Merge 0.9->0.10 | Kim Alvefur | 2015-10-17 | 1 | -1/+1 | |
| |\| | ||||||
| | * | Makefile: Use more specific globbing for core directory in Makefile (Thanks ↵ | Kim Alvefur | 2015-10-14 | 1 | -1/+1 | |
| | | | | | | | | | | | | Robert Scheck) (fixes #532) | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2015-10-11 | 5 | -11/+46 | |
|\| | | ||||||
| * | | Merge 0.9->0.10 | Kim Alvefur | 2015-10-11 | 1 | -3/+7 | |
| |\| | ||||||
| | * | util.openssl: Separate extension sections into one for self-signed certs and ↵ | Kim Alvefur | 2015-10-11 | 1 | -3/+7 | |
| | | | | | | | | | | | | one for requests | |||||
| * | | core.certmanager: Remove non-string filenames (allows setting eg capath to ↵ | Kim Alvefur | 2015-10-11 | 1 | -0/+2 | |
| | | | | | | | | | | | | false to disable the built in default) | |||||
| * | | mod_s2s: Fire global event for stream features where the remote server has ↵ | Kim Alvefur | 2015-10-11 | 1 | -0/+1 | |
| | | | | | | | | | | | | not sent the 'to' stream attribute | |||||
| * | | net.websocket.frames: Fix syntax error due to code copy pasting | Kim Alvefur | 2015-10-06 | 1 | -2/+2 | |
| | | | ||||||
| * | | net.websocket.frames: Use struct packing in Lua 5.3 or struct lib if available | Kim Alvefur | 2015-10-06 | 1 | -0/+25 | |
| | | | ||||||
| * | | net.websocket.frames: Pack and unpack 64bit ints without overflows ↵ | Kim Alvefur | 2015-10-06 | 1 | -4/+6 | |
| | | | | | | | | | | | | (lua-bitop/bit32 are 32bit) | |||||
| * | | net.websocket.frames: Link to documentation when bitop is missing | Kim Alvefur | 2015-10-06 | 1 | -1/+1 | |
| | | | ||||||
| * | | net.websocket.frames: Throw an error if no bit lib is found | Kim Alvefur | 2015-10-06 | 1 | -2/+2 | |
| | | | ||||||
| * | | net.websocket.frames: Simplify import of bitlib | Kim Alvefur | 2015-10-06 | 1 | -3/+1 | |
| | | | ||||||
| * | | mod_websocket: Silence luacheck warnings | Kim Alvefur | 2015-10-06 | 1 | -1/+2 | |
| | | | ||||||
| * | | mod_websocket: Import util.timer and session close timeout config option ↵ | Kim Alvefur | 2015-10-06 | 1 | -0/+2 | |
| | | | | | | | | | | | | (thanks fairuz) | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2015-10-02 | 1 | -1/+1 | |
|\| | | ||||||
| * | | util.jid: Fix backout | Kim Alvefur | 2015-10-02 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2015-10-02 | 1 | -1/+5 | |
|\| | | ||||||
| * | | Backout 7e820979fd9b (broke tests) | Kim Alvefur | 2015-10-02 | 1 | -1/+5 | |
| | | | ||||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2015-09-27 | 5 | -60/+57 | |
|\| | | ||||||
| * | | Merge 0.9->0.10 | Kim Alvefur | 2015-09-27 | 1 | -2/+2 | |
| |\| | ||||||
| | * | mod_http_files: Translate forward slashes to local directory separators | Kim Alvefur | 2015-09-26 | 1 | -1/+1 | |
| | | | ||||||
| | * | mod_http_files: Strip trailing directory separator regardless of ↵ | Kim Alvefur | 2015-09-26 | 1 | -1/+1 | |
| | | | | | | | | | | | | directionality of the slash (fixes #545) | |||||
| * | | configure,util-src/Makefile: Make a variable that includes -l for OpenSSL ↵ | Kim Alvefur | 2015-09-27 | 2 | -2/+4 | |
| | | | | | | | | | | | | (like with IDNA_LIBS) | |||||
| * | | Makefile: Use hypen to tell Make when to ignore errors | Kim Alvefur | 2015-09-27 | 1 | -2/+2 | |
| | | | ||||||
| * | | Makefile: Support generating prosody.version from hg archive metadata file | Kim Alvefur | 2015-09-27 | 1 | -0/+3 | |
| | | | ||||||
| * | | Makefile: Simplify generation of prosody.version using magic Make magic | Kim Alvefur | 2015-09-27 | 1 | -5/+10 | |
| | | | ||||||
| * | | util-src/Makefile: Remove redundant variables (set in config.unix already) | Kim Alvefur | 2015-09-27 | 1 | -8/+0 | |
| | | | ||||||
| * | | util-src/Makefile: Don't make exceptions for how to build .so for ↵ | Kim Alvefur | 2015-09-27 | 1 | -4/+2 | |
| | | | | | | | | | | | | util.hashes and util.encodings | |||||
| * | | util-src/Makefile: Tell Make how to build .so from .o in a modern way (Let ↵ | Kim Alvefur | 2015-09-27 | 1 | -6/+2 | |
| | | | | | | | | | | | | built-in rules handle .o) | |||||
| * | | util-src/Makefile: Move Lua include path into CFLAGS variable | Kim Alvefur | 2015-09-27 | 1 | -2/+2 | |
| | | | ||||||
| * | | configure, util-src/Makefile: Move OS X deployment flag to an C compiler ↵ | Kim Alvefur | 2015-09-26 | 2 | -3/+1 | |
| | | | | | | | | | | | | argument set by configure | |||||
| * | | util-src/Makefile: Use variables for install binary and target directory | Kim Alvefur | 2015-09-26 | 1 | -1/+4 | |
| | | | ||||||
| * | | util-src/Makefile: Move list of .so files in a variable | Kim Alvefur | 2015-09-26 | 1 | -6/+6 | |
| | | |