aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge 0.9->trunkMatthew Wild2013-04-271-0/+16
|\
| * moduleapi: Add module:get_option_inherited_set() to return a set that ↵Matthew Wild2013-04-271-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 Wild2013-04-271-0/+4
| | | | | | | | given host (or global). module:context("*"):get_option("foo") to get global options.
* | Merge 0.9->trunkMatthew Wild2013-04-271-2/+4
|\|
| * util.prosodyctl: Initialize storagemanager on the host before initializing ↵Matthew Wild2013-04-271-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->trunkMatthew Wild2013-04-261-1/+2
|\|
| * mod_s2s: Obey tcp_keepalives option for s2s too, and make it individually ↵Matthew Wild2013-04-261-1/+2
| | | | | | | | configurable through s2s_tcp_keepalives (thanks yeled)
* | Merge 0.9->trunkMatthew Wild2013-04-254-39/+46
|\|
| * mod_admin_telnet: Add muc:create(room) (thanks SkyBlue)Matthew Wild2013-04-251-2/+12
| |
| * MUC: add __tostring on room metatableMatthew Wild2013-04-251-0/+4
| |
| * mod_c2s: Refactor <stream:error> building to allways tostring() it and only ↵Kim Alvefur2013-04-251-9/+9
| | | | | | | | call send once
| * util.json: New, improved, fixed codepoint to UTF-8 conversion.Waqas Hussain2013-04-231-26/+11
| |
| * util.json: Make encode(decode("[]"))=="[]".Waqas Hussain2013-04-231-2/+10
| |
* | Merge 0.9->trunkMatthew Wild2013-04-232-643/+561
|\|
| * mod_admin_adhoc: Use util.adhocFlorian Zeitz2013-04-231-643/+530
| |
| * util.adhoc: New util for generating common adhoc handler patternsFlorian Zeitz2013-04-231-0/+31
| |
* | Merges all the way downMatthew Wild2013-04-230-0/+0
|\ \
| * \ Merge 0.9->trunkKim Alvefur2013-04-197-40/+46
| |\ \
| * \ \ Merge 0.9->trunkKim Alvefur2013-04-191-1/+1
| |\ \ \
* | \ \ \ Merge 0.9->trunkMatthew Wild2013-04-2313-51/+66
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | MergeMatthew Wild2013-04-230-0/+0
| |\ \ \
| | * | | mod_c2s, mod_s2s, net.http, net.http.server: Improve tracebacks (omit ↵Matthew Wild2013-04-224-8/+8
| | | | | | | | | | | | | | | | | | | | traceback function), to make it clearer where an error occured
| | * | | net.server.http: Add a commentMatthew Wild2013-04-221-0/+1
| | | | |
| | * | | net.server.http: Ensure that event map cannot grow forever (limit to 10K ↵Matthew Wild2013-04-221-0/+8
| | | | | | | | | | | | | | | | | | | | wildcard-only entries)
| * | | | mod_auth_internal_plain: Don't log passwords, even at debug levelMatthew Wild2013-04-231-1/+1
| | | | |
| * | | | mod_c2s, mod_s2s, net.http, net.http.server: Improve tracebacks (omit ↵Matthew Wild2013-04-224-8/+8
| | | | | | | | | | | | | | | | | | | | traceback function), to make it clearer where an error occured
| * | | | net.server.http: Add a commentMatthew Wild2013-04-221-0/+1
| | | | |
| * | | | net.server.http: Ensure that event map cannot grow forever (limit to 10K ↵Matthew Wild2013-04-221-0/+8
| | | | | | | | | | | | | | | | | | | | wildcard-only entries)
| * | | | storagemanager: Fix traceback in logging when store type is nil, and store ↵Waqas Hussain2013-04-221-1/+1
| | |_|/ | |/| | | | | | | | | | is unsupported.
| * | | mod_auth_internal_hashed, mod_auth_internal_plain, mod_privacy, mod_private, ↵Kim Alvefur2013-04-197-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 Alvefur2013-04-191-1/+1
| |/ | | | | | | module by default
* | Merge 0.9->trunkMatthew Wild2013-04-191-0/+4
|\|
| * moduleapi: Add module:open_store() as a front-end to storagemanager.open()Matthew Wild2013-04-191-0/+4
| |
* | Merge 0.9->trunkMatthew Wild2013-04-183-0/+586
|\|
| * mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting ↵Matthew Wild2013-04-183-0/+586
| | | | | | | | cross-module connection sharing, transactions and Things - a work in progress
* | Merge 0.9->trunkMatthew Wild2013-04-181-1/+4
|\|
| * net.server_select: Don't call onconnect twice for SSL connectionsMatthew Wild2013-04-181-1/+1
| |
| * Merge backoutMatthew Wild2013-04-181-0/+3
| |\
| | * Backed out changeset f2631a14b953Matthew Wild2013-04-181-0/+3
| | |
* | | Merge 0.9->trunkMatthew Wild2013-04-183-38/+44
|\| |
| * | net.http: When HTTP request fails due to a network or SSL error, call the ↵Matthew Wild2013-04-181-7/+12
| | | | | | | | | | | | callback to let it know
| * | net.http.server: The correct Connection header value to look for is ↵Waqas Hussain2013-04-171-1/+1
| | | | | | | | | | | | Keep-Alive, not keep-alive.
| * | net.server_select: Add and improve some comments.Waqas Hussain2013-04-161-2/+5
| | |
| * | net.server_select: Move socket timeout cleanup code out of a timer, into the ↵Waqas Hussain2013-04-161-22/+20
| | | | | | | | | | | | select loop (which makes util.timer the only timer using server_select._addtimer).
| * | net.server_select: Normalize indentationKim Alvefur2013-04-171-6/+6
| |/
* | Merge 0.9->trunkKim Alvefur2013-04-172-4/+3
|\|
| * net.server_select: Don't call onconnect twice on SSL connectionsKim Alvefur2013-04-171-3/+0
| |
| * mod_pubsub: Only assign id to item element if there is oneMatthew Wild2013-04-171-1/+3
| |
* | Merge 0.9->trunkMatthew Wild2013-04-171-1/+5
|\|
| * mod_pubsub: Add id to stored item when auto-generated. Fixes #335Matthew Wild2013-04-171-1/+5
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 23:44:49 +0000