Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | util.sql: Do lazy fetching of affected/rowcount | Kim Alvefur | 2013-07-12 | 1 | -3/+3 | |
| | | ||||||
* | | Backed out changeset 3c57c2281087 | Kim Alvefur | 2013-07-12 | 1 | -1/+2 | |
| | | ||||||
* | | util.sql: Don't fetch row count of result sets for queries that don't have ↵ | Kim Alvefur | 2013-07-12 | 1 | -2/+1 | |
| | | | | | | | | result sets | |||||
* | | mod_storage_sql2: Add archive store with append and find methods | Kim Alvefur | 2013-07-12 | 1 | -0/+89 | |
| | | ||||||
* | | mod_storage_sql2: Create an additional table `prosodyarchive` for ↵ | Kim Alvefur | 2013-07-12 | 1 | -1/+18 | |
| | | | | | | | | chronological collections | |||||
* | | util.sql: Set charset and collation for MySQL when creating tables | Kim Alvefur | 2013-07-11 | 1 | -0/+2 | |
| | | ||||||
* | | Remove plugins/storage/sqlbasic.lib.lua, which seems obsolete | Matthew Wild | 2013-07-11 | 1 | -97/+0 | |
| | | ||||||
* | | Merge 0.9->trunk | Matthew Wild | 2013-07-11 | 0 | -0/+0 | |
|\| | ||||||
| * | mod_storage_sql2: Remove from 0.9 | Matthew Wild | 2013-07-11 | 1 | -237/+0 | |
| | | ||||||
* | | mod_storage_sql2: Support XML serialization for stanzas. | Kim Alvefur | 2013-07-10 | 1 | -0/+9 | |
| | | ||||||
* | | mod_storage_sql2: Keep available store types in a table | Kim Alvefur | 2013-07-10 | 1 | -2/+7 | |
| | | ||||||
* | | mod_storage_sql2: Fix iteration over users and stores | Kim Alvefur | 2013-07-10 | 1 | -2/+16 | |
| | | ||||||
* | | mod_storage_sql2: Make sure the user field is not NULL | Kim Alvefur | 2013-07-10 | 1 | -4/+4 | |
| | | ||||||
* | | Merge 0.9->trunk | Kim Alvefur | 2013-07-10 | 2 | -3/+3 | |
|\| | ||||||
| * | net.dns, net.adns: Make sure errors from net.server are propagated (thanks ↵ | Kim Alvefur | 2013-07-10 | 2 | -3/+3 | |
| | | | | | | | | asterix) | |||||
* | | Merge 0.9->trunk | Matthew Wild | 2013-07-09 | 2 | -1/+7 | |
|\| | ||||||
| * | mod_component: Local imports for some functions, including xpcall | Matthew Wild | 2013-07-08 | 1 | -0/+1 | |
| | | ||||||
| * | mod_bosh: pcall() core_process_stanza per stanza, to bring in line with ↵ | Matthew Wild | 2013-07-08 | 1 | -1/+4 | |
| | | | | | | | | other listeners. This ensures that stanzas following a traceback-causing stanza in a request will still be processed (as would happen on normal c2s). | |||||
| * | mod_bosh: Only pass stanza to core_process_stanza if it wasn't dropped by ↵ | Matthew Wild | 2013-07-08 | 1 | -1/+3 | |
| | | | | | | | | filters | |||||
* | | Merge 0.9->trunk | Matthew Wild | 2013-07-08 | 1 | -1/+6 | |
|\| | ||||||
| * | mod_component: xpcall() stanza processing, as per other listeners, ↵ | Matthew Wild | 2013-07-08 | 1 | -1/+6 | |
| | | | | | | | | preventing potentially harmful 'top-level errors' | |||||
* | | prosodyctl: Import local_addresses from the new util.net intead of luasocket | Kim Alvefur | 2013-07-01 | 1 | -1/+1 | |
| | | ||||||
* | | Merge 0.9->trunk | Kim Alvefur | 2013-06-29 | 1 | -1/+1 | |
|\| | ||||||
| * | mod_admin_adhoc: Fix node of the "Get List of Online Users" command | Florian Zeitz | 2013-06-29 | 1 | -1/+1 | |
| | | ||||||
* | | Merge | Matthew Wild | 2013-06-29 | 38 | -1093/+1666 | |
|\ \ | ||||||
| * | | Merge 0.9->trunk | Matthew Wild | 2013-06-29 | 2 | -1/+2 | |
| |\| | ||||||
| | * | util.pposix: setrlimit(): Add missing return on error when an incorrect ↵ | Matthew Wild | 2013-06-28 | 1 | -0/+1 | |
| | | | | | | | | | | | | number of arguments are passed | |||||
| * | | Merge 0.9->trunk | Matthew Wild | 2013-06-26 | 1 | -4/+13 | |
| |\ \ | ||||||
| * | | | mod_s2s: Add missing global hook for read-timeout | Kim Alvefur | 2013-06-26 | 1 | -0/+2 | |
| | | | | ||||||
| * | | | Merge 0.9->trunk | Matthew Wild | 2013-06-24 | 1 | -1/+1 | |
| |\ \ \ | ||||||
| * | | | | mod_admin_telnet: Refactor s2s:show() | Kim Alvefur | 2013-06-20 | 1 | -55/+55 | |
| | | | | | ||||||
| * | | | | mod_admin_telnet: Generate session names the same way as in s2smanager | Kim Alvefur | 2013-06-20 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | mod_admin_telnet: Refactor s2s:close and s2s:closeall | Kim Alvefur | 2013-06-20 | 1 | -53/+15 | |
| | | | | | ||||||
| * | | | | mod_register: Fix indentation | Kim Alvefur | 2013-06-19 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | mod_admin_telnet: Refactor s2s:showcert() | Kim Alvefur | 2013-06-19 | 1 | -8/+3 | |
| | | | | | ||||||
| * | | | | net.dns: Support IPv6 addresses in resolv.conf | Florian Zeitz | 2013-06-18 | 1 | -6/+13 | |
| | | | | | ||||||
| * | | | | Merge 0.9->trunk | Matthew Wild | 2013-06-18 | 3 | -23/+121 | |
| |\ \ \ \ | ||||||
| * | | | | | mod_tls: Remove debug statement | Kim Alvefur | 2013-06-16 | 1 | -1/+0 | |
| | | | | | | ||||||
| * | | | | | additional fix for erlparse loading in ejabberd2prosody.lua | Vadim Misbakh-Soloviov | 2013-06-14 | 1 | -0/+1 | |
| | | | | | | ||||||
| * | | | | | package{,c}path fixes for migration tools | Vadim Misbakh-Soloviov | 2013-06-14 | 5 | -5/+34 | |
| | | | | | | ||||||
| * | | | | | Merge the merge | Matthew Wild | 2013-06-13 | 9 | -223/+296 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | mod_muc: Add Ad-Hoc command to destroy MUC rooms | Florian Zeitz | 2013-06-05 | 1 | -0/+36 | |
| | | | | | | | ||||||
| | * | | | | | mod_muc: Utilize mod_disco, instead of reimplementing disco handling | Florian Zeitz | 2013-06-05 | 1 | -14/+9 | |
| | | | | | | | ||||||
| | * | | | | | mod_pubsub: Utilize mod_disco, instead of reimplementing disco handling | Florian Zeitz | 2013-06-05 | 1 | -130/+108 | |
| | | | | | | | ||||||
| | * | | | | | mod_disco: Allow ansering disco requests including nodes, and adding custom ↵ | Florian Zeitz | 2013-06-04 | 1 | -8/+35 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | items to disco#items requests | |||||
| | * | | | | | mod_http_files: Put the MIME type map in a global shared table | Kim Alvefur | 2013-06-13 | 1 | -1/+1 | |
| | | | | | | | ||||||
| | * | | | | | util.sasl.external: Add SASL EXTERNAL mechanism | Kim Alvefur | 2013-06-13 | 2 | -0/+26 | |
| | | | | | | | ||||||
| | * | | | | | prosody: Remove global ssl context, no longer used | Kim Alvefur | 2013-06-13 | 1 | -6/+0 | |
| | | | | | | | ||||||
| | * | | | | | mod_tls: Refactor to allow separate SSL configuration for c2s and s2s ↵ | Kim Alvefur | 2013-06-13 | 1 | -26/+36 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | connections | |||||
| | * | | | | | certmanager: Overhaul of how ssl configs are built. | Kim Alvefur | 2013-06-13 | 1 | -38/+45 | |
| | | | | | | |