aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* mod_adhoc: Add local_user permissionFlorian Zeitz2013-07-241-9/+20
* mod_adhoc: Use mod_disco for disco handlingFlorian Zeitz2013-07-241-52/+39
* mod_adhoc: Sort commands by node. This guarantees the order remains the same ...Florian Zeitz2013-07-241-1/+5
* Merge 0.9->trunkKim Alvefur2013-07-242-6/+6
|\
| * adhoc.lib: Don't build error reply from reply stanzaKim Alvefur2013-07-241-5/+5
| * mod_c2s: Change default of tcp_keepalives to true, and make it individually c...Kim Alvefur2013-07-241-1/+1
* | Merge 0.9->trunkKim Alvefur2013-07-222-1/+2
|\|
| * net.server_event: Pass ondrain handler from listenerKim Alvefur2013-07-221-0/+1
| * net.http.server: Fix Keep-Alive requests with HTTP 1.0Kim Alvefur2013-07-221-1/+1
* | Merge 0.9->trunkMatthew Wild2013-07-151-4/+4
|\|
| * util.net: Fix compilation on Windows (outputs an empty list of addresses for ...Matthew Wild2013-07-151-4/+4
* | Merge 0.9->trunkMatthew Wild2013-07-151-0/+1
|\|
| * util.net: Include missing header needed for successful compiltion on FreeBSDMatthew Wild2013-07-151-0/+1
* | util.events: Remove varargs, event handlers can now only accept a single para...Matthew Wild2013-07-151-3/+3
* | mod_bosh, mod_c2s: No longer fire stream-features globally (nobody uses it, a...Matthew Wild2013-07-152-3/+0
* | rostermanager, mod_groups: Change roster-load event to pass an event table fo...Matthew Wild2013-07-152-2/+4
* | Merge 0.9->trunkMatthew Wild2013-07-131-0/+1
|\|
| * certmanager: Set our own default cipher string, which includes only ciphers r...Matthew Wild2013-07-131-0/+1
* | util.sql: Do lazy fetching of affected/rowcountKim Alvefur2013-07-121-3/+3
* | Backed out changeset 3c57c2281087Kim Alvefur2013-07-121-1/+2
* | util.sql: Don't fetch row count of result sets for queries that don't have re...Kim Alvefur2013-07-121-2/+1
* | mod_storage_sql2: Add archive store with append and find methodsKim Alvefur2013-07-121-0/+89
* | mod_storage_sql2: Create an additional table `prosodyarchive` for chronologic...Kim Alvefur2013-07-121-1/+18
* | util.sql: Set charset and collation for MySQL when creating tablesKim Alvefur2013-07-111-0/+2
* | Remove plugins/storage/sqlbasic.lib.lua, which seems obsoleteMatthew Wild2013-07-111-97/+0
* | Merge 0.9->trunkMatthew Wild2013-07-110-0/+0
|\|
| * mod_storage_sql2: Remove from 0.9Matthew Wild2013-07-111-237/+0
* | mod_storage_sql2: Support XML serialization for stanzas.Kim Alvefur2013-07-101-0/+9
* | mod_storage_sql2: Keep available store types in a tableKim Alvefur2013-07-101-2/+7
* | mod_storage_sql2: Fix iteration over users and storesKim Alvefur2013-07-101-2/+16
* | mod_storage_sql2: Make sure the user field is not NULLKim Alvefur2013-07-101-4/+4
* | Merge 0.9->trunkKim Alvefur2013-07-102-3/+3
|\|
| * net.dns, net.adns: Make sure errors from net.server are propagated (thanks as...Kim Alvefur2013-07-102-3/+3
* | Merge 0.9->trunkMatthew Wild2013-07-092-1/+7
|\|
| * mod_component: Local imports for some functions, including xpcallMatthew Wild2013-07-081-0/+1
| * mod_bosh: pcall() core_process_stanza per stanza, to bring in line with other...Matthew Wild2013-07-081-1/+4
| * mod_bosh: Only pass stanza to core_process_stanza if it wasn't dropped by fil...Matthew Wild2013-07-081-1/+3
* | Merge 0.9->trunkMatthew Wild2013-07-081-1/+6
|\|
| * mod_component: xpcall() stanza processing, as per other listeners, preventing...Matthew Wild2013-07-081-1/+6
* | prosodyctl: Import local_addresses from the new util.net intead of luasocketKim Alvefur2013-07-011-1/+1
* | Merge 0.9->trunkKim Alvefur2013-06-291-1/+1
|\|
| * mod_admin_adhoc: Fix node of the "Get List of Online Users" commandFlorian Zeitz2013-06-291-1/+1
* | MergeMatthew Wild2013-06-2938-1093/+1666
|\ \
| * | Merge 0.9->trunkMatthew Wild2013-06-292-1/+2
| |\|
| | * util.pposix: setrlimit(): Add missing return on error when an incorrect numbe...Matthew Wild2013-06-281-0/+1
| * | Merge 0.9->trunkMatthew Wild2013-06-261-4/+13
| |\ \
| * | | mod_s2s: Add missing global hook for read-timeoutKim Alvefur2013-06-261-0/+2
| * | | Merge 0.9->trunkMatthew Wild2013-06-241-1/+1
| |\ \ \
| * | | | mod_admin_telnet: Refactor s2s:show()Kim Alvefur2013-06-201-55/+55
| * | | | mod_admin_telnet: Generate session names the same way as in s2smanagerKim Alvefur2013-06-201-1/+1