aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge 0.9->trunkMatthew Wild2013-04-295-88/+156
|\
| * Merge with FlorobMatthew Wild2013-04-294-12/+13
| |\
| * | util.hashes, util.sasl.scram: Implement SCRAM-SHA1's Hi in CFlorian Zeitz2013-04-282-13/+51
| * | util.hmac, util.hashes: Implement HMAC functions in C, and move to util.hashesFlorian Zeitz2013-04-275-75/+105
* | | Merge 0.9->trunkMatthew Wild2013-04-292-2/+2
|\ \ \ | | |/ | |/|
| * | mod_saslauth, mod_compression: Fix some cases where open_stream() was not bei...Matthew Wild2013-04-292-2/+2
* | | Merge 0.9->trunkMatthew Wild2013-04-296-13/+27
|\| |
| * | mod_s2s: Ensure that to/from on stream headers are always correct, fixes #338Matthew Wild2013-04-291-6/+7
| * | prosodyctl: Put keys and certificates in ./certs when in a source checkoutKim Alvefur2013-04-281-4/+4
| |/
| * net.server*: Allow the TCP backlog parameter to be set in the configKim Alvefur2013-04-273-2/+8
| * moduleapi: in module:provides(), add the name of the module in item._provided_byKim Alvefur2013-04-271-0/+1
| * moduleapi: module:provides called without an item makes a copy of the environ...Kim Alvefur2013-04-271-1/+7
* | Merge 0.9->trunkMatthew Wild2013-04-271-0/+16
|\|
| * moduleapi: Add module:get_option_inherited_set() to return a set that inherit...Matthew Wild2013-04-271-0/+12
| * moduleapi: Add module:context(host) to produce a fake API context for a given...Matthew Wild2013-04-271-0/+4
* | Merge 0.9->trunkMatthew Wild2013-04-271-2/+4
|\|
| * util.prosodyctl: Initialize storagemanager on the host before initializing us...Matthew Wild2013-04-271-2/+4
* | Merge 0.9->trunkMatthew Wild2013-04-261-1/+2
|\|
| * mod_s2s: Obey tcp_keepalives option for s2s too, and make it individually con...Matthew Wild2013-04-261-1/+2
* | 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 c...Kim Alvefur2013-04-251-9/+9
| * 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 traceba...Matthew Wild2013-04-224-8/+8
| | * | | net.server.http: Add a commentMatthew Wild2013-04-221-0/+1
| | * | | net.server.http: Ensure that event map cannot grow forever (limit to 10K wild...Matthew Wild2013-04-221-0/+8
| * | | | 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 traceba...Matthew Wild2013-04-224-8/+8
| * | | | net.server.http: Add a commentMatthew Wild2013-04-221-0/+1
| * | | | net.server.http: Ensure that event map cannot grow forever (limit to 10K wild...Matthew Wild2013-04-221-0/+8
| * | | | storagemanager: Fix traceback in logging when store type is nil, and store is...Waqas Hussain2013-04-221-1/+1
| | |_|/ | |/| |
| * | | mod_auth_internal_hashed, mod_auth_internal_plain, mod_privacy, mod_private, ...Kim Alvefur2013-04-197-40/+46
| | |/ | |/|
| * | moduleapi: Make module:open_store() open a store named after the calling modu...Kim Alvefur2013-04-191-1/+1
| |/
* | 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
* | 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
| |\