Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge 0.9->trunk | Matthew Wild | 2013-04-27 | 1 | -0/+16 | |
|\| | | | | | ||||||
| * | | | | | moduleapi: Add module:get_option_inherited_set() to return a set that ↵ | Matthew Wild | 2013-04-27 | 1 | -0/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | inherits items from a globally set set, if set | |||||
| * | | | | | moduleapi: Add module:context(host) to produce a fake API context for a ↵ | Matthew Wild | 2013-04-27 | 1 | -0/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | given host (or global). module:context("*"):get_option("foo") to get global options. | |||||
* | | | | | | Merge 0.9->trunk | Matthew Wild | 2013-04-27 | 1 | -2/+4 | |
|\| | | | | | ||||||
| * | | | | | util.prosodyctl: Initialize storagemanager on the host before initializing ↵ | Matthew Wild | 2013-04-27 | 1 | -2/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | usermanager. This fixes brokenness when the auth provider opens the store on load (as they all do since eeea0eb2602a) (thanks nulani) | |||||
* | | | | | | Merge 0.9->trunk | Matthew Wild | 2013-04-26 | 1 | -1/+2 | |
|\| | | | | | ||||||
| * | | | | | mod_s2s: Obey tcp_keepalives option for s2s too, and make it individually ↵ | Matthew Wild | 2013-04-26 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | configurable through s2s_tcp_keepalives (thanks yeled) | |||||
* | | | | | | Merge 0.9->trunk | Matthew Wild | 2013-04-25 | 4 | -39/+46 | |
|\| | | | | | ||||||
| * | | | | | mod_admin_telnet: Add muc:create(room) (thanks SkyBlue) | Matthew Wild | 2013-04-25 | 1 | -2/+12 | |
| | | | | | | ||||||
| * | | | | | MUC: add __tostring on room metatable | Matthew Wild | 2013-04-25 | 1 | -0/+4 | |
| | | | | | | ||||||
| * | | | | | mod_c2s: Refactor <stream:error> building to allways tostring() it and only ↵ | Kim Alvefur | 2013-04-25 | 1 | -9/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | call send once | |||||
| * | | | | | util.json: New, improved, fixed codepoint to UTF-8 conversion. | Waqas Hussain | 2013-04-23 | 1 | -26/+11 | |
| | | | | | | ||||||
| * | | | | | util.json: Make encode(decode("[]"))=="[]". | Waqas Hussain | 2013-04-23 | 1 | -2/+10 | |
| | | | | | | ||||||
* | | | | | | Merge 0.9->trunk | Matthew Wild | 2013-04-23 | 2 | -643/+561 | |
|\| | | | | | ||||||
| * | | | | | mod_admin_adhoc: Use util.adhoc | Florian Zeitz | 2013-04-23 | 1 | -643/+530 | |
| | | | | | | ||||||
| * | | | | | util.adhoc: New util for generating common adhoc handler patterns | Florian Zeitz | 2013-04-23 | 1 | -0/+31 | |
| | | | | | | ||||||
* | | | | | | Merges all the way down | Matthew Wild | 2013-04-23 | 0 | -0/+0 | |
|\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge 0.9->trunk | Kim Alvefur | 2013-04-19 | 7 | -40/+46 | |
| |\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | Merge 0.9->trunk | Kim Alvefur | 2013-04-19 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ | ||||||
* | \ \ \ \ \ \ \ | Merge 0.9->trunk | Matthew Wild | 2013-04-23 | 13 | -51/+66 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | / / / / / | | |_|/ / / / / | |/| | | | | | | ||||||
| * | | | | | | | Merge | Matthew Wild | 2013-04-23 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | mod_c2s, mod_s2s, net.http, net.http.server: Improve tracebacks (omit ↵ | Matthew Wild | 2013-04-22 | 4 | -8/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | traceback function), to make it clearer where an error occured | |||||
| | * | | | | | | | net.server.http: Add a comment | Matthew Wild | 2013-04-22 | 1 | -0/+1 | |
| | | | | | | | | | ||||||
| | * | | | | | | | net.server.http: Ensure that event map cannot grow forever (limit to 10K ↵ | Matthew Wild | 2013-04-22 | 1 | -0/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wildcard-only entries) | |||||
| * | | | | | | | | mod_auth_internal_plain: Don't log passwords, even at debug level | Matthew Wild | 2013-04-23 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | mod_c2s, mod_s2s, net.http, net.http.server: Improve tracebacks (omit ↵ | Matthew Wild | 2013-04-22 | 4 | -8/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | traceback function), to make it clearer where an error occured | |||||
| * | | | | | | | | net.server.http: Add a comment | Matthew Wild | 2013-04-22 | 1 | -0/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | net.server.http: Ensure that event map cannot grow forever (limit to 10K ↵ | Matthew Wild | 2013-04-22 | 1 | -0/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wildcard-only entries) | |||||
| * | | | | | | | | storagemanager: Fix traceback in logging when store type is nil, and store ↵ | Waqas Hussain | 2013-04-22 | 1 | -1/+1 | |
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | is unsupported. | |||||
| * | | | | | | | mod_auth_internal_hashed, mod_auth_internal_plain, mod_privacy, mod_private, ↵ | Kim Alvefur | 2013-04-19 | 7 | -40/+46 | |
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | mod_register, mod_vcard, mod_muc: Use module:open_store() | |||||
| * | | | | | | moduleapi: Make module:open_store() open a store named after the calling ↵ | Kim Alvefur | 2013-04-19 | 1 | -1/+1 | |
| |/ / / / / | | | | | | | | | | | | | | | | | | | module by default | |||||
* | | | | | | Merge 0.9->trunk | Matthew Wild | 2013-04-19 | 1 | -0/+4 | |
|\| | | | | | ||||||
| * | | | | | moduleapi: Add module:open_store() as a front-end to storagemanager.open() | Matthew Wild | 2013-04-19 | 1 | -0/+4 | |
| | | | | | | ||||||
* | | | | | | Merge 0.9->trunk | Matthew Wild | 2013-04-18 | 3 | -0/+586 | |
|\| | | | | | ||||||
| * | | | | | mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting ↵ | Matthew Wild | 2013-04-18 | 3 | -0/+586 | |
| | | | | | | | | | | | | | | | | | | | | | | | | cross-module connection sharing, transactions and Things - a work in progress | |||||
* | | | | | | Merge 0.9->trunk | Matthew Wild | 2013-04-18 | 1 | -1/+4 | |
|\| | | | | | ||||||
| * | | | | | net.server_select: Don't call onconnect twice for SSL connections | Matthew Wild | 2013-04-18 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Merge backout | Matthew Wild | 2013-04-18 | 1 | -0/+3 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Backed out changeset f2631a14b953 | Matthew Wild | 2013-04-18 | 1 | -0/+3 | |
| | | | | | | | ||||||
* | | | | | | | Merge 0.9->trunk | Matthew Wild | 2013-04-18 | 3 | -38/+44 | |
|\| | | | | | | ||||||
| * | | | | | | net.http: When HTTP request fails due to a network or SSL error, call the ↵ | Matthew Wild | 2013-04-18 | 1 | -7/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | callback to let it know | |||||
| * | | | | | | net.http.server: The correct Connection header value to look for is ↵ | Waqas Hussain | 2013-04-17 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep-Alive, not keep-alive. | |||||
| * | | | | | | net.server_select: Add and improve some comments. | Waqas Hussain | 2013-04-16 | 1 | -2/+5 | |
| | | | | | | | ||||||
| * | | | | | | net.server_select: Move socket timeout cleanup code out of a timer, into the ↵ | Waqas Hussain | 2013-04-16 | 1 | -22/+20 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | select loop (which makes util.timer the only timer using server_select._addtimer). | |||||
| * | | | | | | net.server_select: Normalize indentation | Kim Alvefur | 2013-04-17 | 1 | -6/+6 | |
| |/ / / / / | ||||||
* | | | | | | Merge 0.9->trunk | Kim Alvefur | 2013-04-17 | 2 | -4/+3 | |
|\| | | | | | ||||||
| * | | | | | net.server_select: Don't call onconnect twice on SSL connections | Kim Alvefur | 2013-04-17 | 1 | -3/+0 | |
| | | | | | | ||||||
| * | | | | | mod_pubsub: Only assign id to item element if there is one | Matthew Wild | 2013-04-17 | 1 | -1/+3 | |
| | | | | | | ||||||
* | | | | | | Merge 0.9->trunk | Matthew Wild | 2013-04-17 | 1 | -1/+5 | |
|\| | | | | | ||||||
| * | | | | | mod_pubsub: Add id to stored item when auto-generated. Fixes #335 | Matthew Wild | 2013-04-17 | 1 | -1/+5 | |
| | | | | | |