aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge 0.10->trunkKim Alvefur2015-10-021-1/+1
|\
| * util.jid: Fix backoutKim Alvefur2015-10-021-1/+1
| |
* | Merge 0.10->trunkKim Alvefur2015-10-021-1/+5
|\|
| * Backout 7e820979fd9b (broke tests)Kim Alvefur2015-10-021-1/+5
| |
* | Merge 0.10->trunkKim Alvefur2015-09-275-60/+57
|\|
| * 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.10->trunkKim Alvefur2015-09-251-3/+3
|\| |
| * | 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)
* | | Merge 0.10->trunkKim Alvefur2015-09-252-3/+17
|\| |
| * | MergeKim Alvefur2015-09-252-3/+17
| |\ \
| | * | Merge 0.9->0.10Matthew Wild2015-09-252-3/+17
| | |\|
| | | * mod_pep: Don't store contacts' subscriptions to a user's nodes when that ↵Matthew Wild2015-09-251-0/+12
| | | | | | | | | | | | | | | | user is offline
| | | * mod_pep: Document data structures, so I don't have to spend time remembering ↵Matthew Wild2015-09-041-0/+4
| | | | | | | | | | | | | | | | every time I work on this module
| | | * net.dns: Unconditionally cache records found in answersMatthew Wild2015-05-251-3/+1
| | | |
* | | | server_event: Remove needless scoping around add_taskKim Alvefur2015-09-251-13/+9
| | | |
* | | | Merge 0.10->trunkKim Alvefur2015-09-253-644/+596
|\| | |
| * | | server_event: Fix indentationKim Alvefur2015-09-251-5/+5
| | | |
| * | | server_event: Put function keyword on same line as the coroutine.wrap it's ↵Kim Alvefur2015-09-251-2/+1
| |/ / | | | | | | | | | being passed to
| * | server_event: Normalize indentationKim Alvefur2015-09-251-118/+118
| | |
| * | net.dns: Use new IPv4-specific socket factory if available (fixes dns on ↵Kim Alvefur2015-09-251-1/+1
| | | | | | | | | | | | libevent with latest development version of luasocket)
| * | server_event: Remove unused argument [luacheck]Kim Alvefur2015-09-251-1/+1
| | |
| * | server_event: Comment out the unused vdebug function [luacheck]Kim Alvefur2015-09-251-1/+1
| | |
| * | server_event: Remove unused former argument (fixes global access) [luacheck]Kim Alvefur2015-09-251-1/+1
| | |
| * | server_event: Rename luaevent module variable to avoid name clash [luacheck]Kim Alvefur2015-09-251-7/+7
| | |
| * | server_event: Add luacheck annotationsKim Alvefur2015-09-251-1/+2
| | |
| * | server_event: Remove needless scoping and indentationKim Alvefur2015-09-251-579/+562
| | |
| * | server_event: Move local references to various functions to top of fileKim Alvefur2015-09-251-22/+18
| | |
| * | server_event: Replace implementation of ordered set with a simple table setKim Alvefur2015-09-251-38/+6
| | |
| * | mod_s2s: Account for connections that time out in connection count measureKim Alvefur2015-09-251-0/+5
| | |
* | | Merge 0.10->trunkKim Alvefur2015-09-243-3/+50
|\| |
| * | mod_c2s, mod_s2s: Close incoming connections if there are no features to ↵Kim Alvefur2015-09-242-3/+13
| | | | | | | | | | | | offer on incomplete streams (fixes #285)
| * | prosodyctl check: Warn if certificate checking is enforced but LuaSec is too oldKim Alvefur2015-09-241-0/+24
| | |
| * | prosodyctl check: Warn if encryption is required but LuaSec is unavailableKim Alvefur2015-09-241-0/+13
| | |
* | | Merge 0.10->trunkKim Alvefur2015-09-227-39/+80
|\| |