aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge 0.10->trunkKim Alvefur2014-09-0214-78/+159
|\
| * Merge 0.9->0.10Kim Alvefur2014-09-029-9/+43
| |\
| | * net.server_select: 'listener'->'listeners' (fixes undefined global access)Matthew Wild2014-09-021-1/+1
| | |
| | * net.http, net.http.server, mod_c2s, mod_s2s, mod_component, ↵Matthew Wild2014-08-297-1/+26
| | | | | | | | | | | | mod_admin_telnet, mod_net_multiplex: Add ondetach to release connection from 'sessions' table (or equivalent)
| | * net.server_{select,event}: Add 'ondetach' callback for listener objects, to ↵Matthew Wild2014-08-292-2/+13
| | | | | | | | | | | | notify them when another listener is being assigned to a connection
| | * mod_s2s: Close offending s2s streams missing an 'id' attribute with a stream ↵Kim Alvefur2014-09-021-2/+5
| | | | | | | | | | | | error instead of throwing an unhandled error
| * | util.uuid: Use util.hex and util.randomMatthew Wild2014-09-021-31/+13
| | |
| * | util.random: Generic util lib for generating strings of random bytesMatthew Wild2014-09-021-0/+43
| | |
| * | util.hex: Small util lib for converting to/from hex stringsMatthew Wild2014-09-021-0/+19
| | |
| * | mod_dialback: Move d-w-d after to/from validationKim Alvefur2014-09-011-9/+9
| | |
| * | mod_s2s_auth_certs: Warn about lack of certificate (Mostly jabberd14 not ↵Kim Alvefur2014-08-291-29/+32
| | | | | | | | | | | | sending a client certificate)
* | | mod_muc: Fix 'destroy rooms' adhoc command (Thanks Florob)Kim Alvefur2014-08-311-1/+1
| | |
* | | Merge 0.10->trunkMatthew Wild2014-08-280-0/+0
|\| |
| * | Merge 0.9->0.10Matthew Wild2014-08-280-0/+0
| |\|
| | * Tagging 0.9.5Matthew Wild2014-08-280-0/+0
| | |
* | | Merge 0.10->trunkMatthew Wild2014-08-2810-21/+37
|\| |
| * | Merge 0.9->0.10Matthew Wild2014-08-2810-20/+36
| |\|
| | * util.filters: Ignore filters being added twice (fixes issues on removal)Matthew Wild2014-08-281-0/+2
| | |
| | * mod_privacy: Fix to correctly sort privacy list rules by order (thanks Flow)Matthew Wild2014-08-281-1/+1
| | |
| | * mod_c2s, mod_s2s: Log received invalid stream headersMatthew Wild2014-08-232-1/+2
| | |
| | * util.xmppstream: When error is 'no-stream', pass the received tagname to the ↵Matthew Wild2014-08-231-1/+1
| | | | | | | | | | | | error handler
| | * mod_s2s: Reset stream ID when resetting stream [compliance]Kim Alvefur2014-08-271-0/+1
| | |
| | * modulemanager: Reduce warning to debug level message about modules already ↵Kim Alvefur2014-08-271-1/+1
| | | | | | | | | | | | being loaded, it's probably just module:depends()
| | * net.http.server: Comment out a log messageKim Alvefur2014-08-271-1/+1
| | |
| | * mod_s2s: Mark stream as opened earlier for outgoing connections, fixes ↵Kim Alvefur2014-08-261-1/+2
| | | | | | | | | | | | double stream headers on policy failures
| | * mod_compression: Handle compression setup errors by logging a warning about ↵Kim Alvefur2014-08-261-0/+6
| | | | | | | | | | | | it (fixes #408)
| | * mod_posix: Make sure that 'pidfile' is a stringKim Alvefur2014-08-261-1/+1
| | |
| | * prosodyctl: Verify that 'pidfile' is a string, show friendly error otherwiseKim Alvefur2014-08-262-0/+5
| | |
| * | util.xmppstream: Don't include empty stream ID in stream header (got here ↵Kim Alvefur2014-08-271-1/+1
| | | | | | | | | | | | from mod_c2s)
* | | Merge 0.10->trunkKim Alvefur2014-08-131-6/+6
|\| |
| * | mod_private: Fix traceback due to missing table indexKim Alvefur2014-08-131-1/+1
| | |
| * | mod_blocklist: Use full word as variable name, we can afford thatKim Alvefur2014-08-121-4/+4
| | |
| * | mod_blocklist: Correct commentKim Alvefur2014-08-121-1/+1
| | |
| * | mod_blocklist: Fix any unblock emptying the blocklistKim Alvefur2014-08-121-1/+1
| | |
* | | mod_storage_sql2: DELETE then INSERT in map storesKim Alvefur2014-08-121-13/+8
| | |
* | | mod_muc: Fix tracebacks (thanks nick1)Kim Alvefur2014-08-111-5/+5
| | |
* | | Merge 0.10->trunkKim Alvefur2014-08-103-439/+277
|\| |
| * | mod_privacy: Remove, leave a log message about being replaced by ↵Kim Alvefur2014-08-101-438/+3
| | | | | | | | | | | | mod_blocklist and load that instead
| * | prosody.cfg.lua.dist: Replace mod_privacy with mod_blocklist in the default ↵Kim Alvefur2014-08-101-1/+1
| | | | | | | | | | | | config
| * | mod_blocklist: XEP-0191 implementation written for speed and independence ↵Kim Alvefur2014-08-101-0/+273
| | | | | | | | | | | | from mod_privacy
* | | mod_private: Use map storeKim Alvefur2014-08-091-12/+9
| | |
* | | Merge 0.10->trunkKim Alvefur2014-08-092-55/+39
|\| |
| * | mod_private: Cleanup and more tailcallsKim Alvefur2014-08-091-30/+26
| | |
| * | util.jid: Optimize bareKim Alvefur2014-08-071-5/+1
| | |
| * | util.jid: Use existing join function in jid.prepKim Alvefur2014-08-071-15/+8
| | |
| * | util.jid: Return early in join on invalid jidsKim Alvefur2014-08-071-6/+5
| | |
| * | mod_s2s: Remove unused localsKim Alvefur2014-07-251-2/+0
| | |
* | | storagemanager: Fix map store shim if store is emptyKim Alvefur2014-08-081-1/+1
| | |
* | | plugins/mod_storage_sql2: Return correct arguments from map_store operationsdaurnimator2014-08-071-2/+6
| | |
* | | plugins/muc/mod_muc: persistent rooms keyval store needs username as nildaurnimator2014-08-071-4/+4
| | |