aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* spec/keep_full_sub_req: Make the second connect a differenct device ↵Kim Alvefur2018-12-011-6/+10
| | | | | | (workaround for scansion issue) scansion threw an error when a client connected again
* spec/keep_full_sub_req: Verify that the presence subscription stays the same ↵Kim Alvefur2018-12-011-0/+17
| | | | after a reconnect
* spec/keep_full_sub_req: Add missing type attributeKim Alvefur2018-12-011-1/+1
|
* tests: Add scansion test for #689 about keeping the full subscription ↵Kim Alvefur2018-11-301-0/+37
| | | | request stanza
* Merge 0.11->trunkKim Alvefur2018-11-301-2/+16
|\
| * server_epoll: Add comments describing config optionsKim Alvefur2018-11-301-0/+15
| |
| * net.server_epoll: Remove unused config optionKim Alvefur2018-11-301-1/+0
| |
| * server_epoll: Increase write timeoutKim Alvefur2018-11-301-1/+1
| | | | | | | | 7 may be too low for some slow machines and/or networks
* | Merge 0.11->trunkKim Alvefur2018-11-302-1/+58
|\|
| * util-src/makefile: Update with util.poll and util.compat (fixes #1251)Kim Alvefur2018-11-301-1/+2
| |
| * net.websocket.frames: Add some brief testsKim Alvefur2018-11-291-0/+56
| | | | | | | | These are mostly just recordings of minimal input roundtripped back into tables.
| * Added tag 0.11.1 for changeset 91856829f18bMatthew Wild2018-11-280-0/+0
| |
* | net.websocket.frames: Prefer Lua 5.2 built-in bit module over LuaJIT versionKim Alvefur2018-11-291-1/+1
| | | | | | | | | | | | When running on Lua 5.2 this makes sense since bit32 is usually already loaded. It's sensible to prefer this going forward in case of incompatibilities between the two variants.
* | configure: Recognise 5.4 as a valid Lua versionKim Alvefur2018-11-291-2/+6
| |
* | configure: Split list of possible suffixes into a line per Lua versionKim Alvefur2018-11-291-1/+3
| |
* | util.format: Tweak how nil values are handledKim Alvefur2018-11-282-5/+6
| | | | | | | | Because [<nil>] seems exsessive
* | Merge 0.11->trunkKim Alvefur2018-11-271-1/+1
|\|
| * mod_csi: Fix copypaste mistake [luacheck]0.11.1Kim Alvefur2018-11-271-1/+1
| |
* | Merge 0.11->trunkKim Alvefur2018-11-272-2/+3
|\|
| * mod_csi: Set session.state to simplify CSI modulesKim Alvefur2018-11-272-2/+1
| | | | | | | | Moved here from mod_csi_simple
| * mod_csi_simple: Fix autocompletion mistakeKim Alvefur2018-11-271-1/+1
| |
| * mod_csi_simple: Bypass importance event in active mode (fixes #1249)Kim Alvefur2018-11-271-1/+3
| |
| * mod_csi_simple: Don't set <delay> stamps on <iq> stanzas (fixes #1248)Kim Alvefur2018-11-271-1/+1
| |
* | MUC: Move check for explicit room join earlier in room creation flowKim Alvefur2018-11-272-8/+1
| |
* | Merge 0.11->trunkKim Alvefur2018-11-262-2/+8
|\|
| * Merge 0.10->0.11Kim Alvefur2018-11-261-1/+7
| |\
| | * mod_proxy65: Check what port is used at the time of the query0.10.3Kim Alvefur2018-11-251-1/+1
| | | | | | | | | | | | Could have changed between startup and time of request
| | * mod_proxy65: Return an error if no port is open (fixes #1240)Kim Alvefur2018-11-251-0/+6
| | |
| * | mod_csi_simple: Use the same event name when firing as when hooking (fixes ↵Kim Alvefur2018-11-251-1/+1
| | | | | | | | | | | | #1245)
* | | Merge 0.11->trunkKim Alvefur2018-11-253-12/+6
|\| |
| * | MUC: Fix traceback on muc#admin query with missing <item> child (#1242)Kim Alvefur2018-11-251-0/+1
| | | | | | | | | | | | Caused by a missing return statement introduced in 494938dec5d8
| * | Added tag 0.11.0 for changeset 83f3a05c1b1bMatthew Wild2018-11-180-0/+0
| | |
| * | CHANGES: Update with release date0.11.0Matthew Wild2018-11-181-1/+1
| | |
| * | prosody.cfg.lua.dist: Tidy up some commentsMatthew Wild2018-11-181-11/+1
| | |
| * | prosody.cfg.lua.dist: Add https_certificate optionMatthew Wild2018-11-181-0/+3
| | |
* | | Merge 0.11->trunkKim Alvefur2018-11-181-1/+1
|\| |
| * | net.server_select: Fix IP validation to use correct variable (thanks quest)Kim Alvefur2018-11-171-1/+1
| | | | | | | | | | | | Copy-paste mistake most likely. Not caught because server_select is ignored by luacheck.
* | | Merge 0.11->trunkKim Alvefur2018-11-173-4/+30
|\| |
| * | mod_csi_simple: Consider non-stanza objects importantKim Alvefur2018-11-171-0/+3
| | | | | | | | | | | | | | | Most cases are for keepalive or stream closing, where it needs to be flushed anyways.
| * | mod_csi_simple: Skip delay tags on objects other than stanzas (thanks quest)Kim Alvefur2018-11-171-2/+4
| | | | | | | | | | | | | | | This may be triggered by sending strings, eg as done by mod_c2s for keepalives, stream errors, "</stream>".
| * | util.stanza: Validate input to clone() (with brief tests)Kim Alvefur2018-11-172-2/+23
| | |
* | | Merge 0.11->trunkMatthew Wild2018-11-151-4/+4
|\| |
| * | mod_storage_sql: Catch errors during schema upgrade (thanks Nothing4You)Matthew Wild2018-11-151-4/+4
| | |
* | | Merge 0.11->trunkMatthew Wild2018-11-151-12/+18
|\| |
| * | MUC: Use defaults from config in create_room() if no config providedMatthew Wild2018-11-151-12/+18
| | |
* | | Merge 0.11->trunkMatthew Wild2018-11-131-1/+1
|\| |
| * | net.http.server: Move event formation to avoid traceback on missing Host headerMatthew Wild2018-11-131-1/+1
| | |
* | | Merge 0.11->trunkKim Alvefur2018-11-121-1/+3
|\| |
| * | spec/scansion/prosody.cfg.lua: Add comment about mod_scansion_recordKim Alvefur2018-11-121-1/+3
| | | | | | | | | | | | | | | This was accidentally included in a previous commit, but having it here makes it easier to enable when making new test cases.
* | | Merge 0.11->trunkKim Alvefur2018-11-123-3/+114
|\| |