aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge 0.10->trunkMatthew Wild2014-01-183-14/+85
|\
| * Merge 0.9->0.10Matthew Wild2014-01-183-14/+85
| |\
| | * tools/ejabberd2prosody: Add support for importing MUC rooms.Waqas Hussain2014-01-181-0/+51
| | |
| | * tools/ejabberdsql2prosody: Skip invalid XML in data, and print out errors.Waqas Hussain2014-01-161-10/+24
| | |
| | * additional fix for erlparse loading in ejabberd2prosody.luaVadim Misbakh-Soloviov2013-06-141-0/+1
| | |
| | * package{,c}path fixes for migration toolsVadim Misbakh-Soloviov2013-06-145-5/+34
| | |
| | * mod_tls: Let s2s_secure_auth override s2s_require_encryption and warn if ↵Kim Alvefur2014-01-151-0/+6
| | | | | | | | | | | | they differ
| | * mod_tls: Rename variables to be less confusingKim Alvefur2014-01-151-4/+4
| | |
* | | Merge 0.10->trunkMatthew Wild2014-01-183-14/+21
|\| |
| * | mod_storage_sql2: Fix SQL syntaxKim Alvefur2014-01-181-2/+2
| | |
| * | MUC: Expose room metatable on moduleKim Alvefur2014-01-181-2/+3
| | |
| * | MUC: Split out sending of the topic into method separate from sending historyKim Alvefur2014-01-181-0/+3
| | |
| * | MUC: Split saving to history into a separate methodKim Alvefur2014-01-181-10/+13
| | |
* | | Merge 0.10->trunkMatthew Wild2014-01-123-10/+14
|\| |
| * | MergeMatthew Wild2014-01-123-19/+45
| |\ \
| | * | mod_storage_sql2: Fix syntax error in subquery (Thanks Lance)Kim Alvefur2014-01-051-2/+2
| | | |
| * | | Merge 0.9->0.10Matthew Wild2014-01-122-8/+12
| |\ \ \ | | | |/ | | |/|
| | * | Tagging 0.9.3Matthew Wild2014-01-120-0/+0
| | | |
| | * | mod_tls: Log error when TLS initialization fails0.9.3Matthew Wild2014-01-121-2/+9
| | | |
| | * | mod_s2s: Include IP in log messages, if host is unavailableFlorian Zeitz2014-01-051-4/+4
| | | |
| | * | tools/migration/migrator/prosody_files: Fix undefined global access of ↵Waqas Hussain2014-01-031-4/+8
| | | | | | | | | | | | | | | | ‘error’, print the actual error message and correct file path in the error message when we fail to load a file, skip broken files instead of failing migration.
* | | | Merge 0.10->trunk and Happy New Year!Kim Alvefur2013-12-313-26/+45
|\ \ \ \ | | |_|/ | |/| |
| * | | util.pubsub: Separate data from node configurationKim Alvefur2013-12-301-7/+26
| | | |
| * | | util.pubsub: Fire events on more actionsKim Alvefur2013-12-261-0/+4
| | | |
| * | | mod_pubsub: Don't sent error replies from service disco events, let ↵Kim Alvefur2013-12-301-6/+3
| | | | | | | | | | | | | | | | mod_disco handle that
| * | | mod_storage_sql2: Expose the unique key argument, allowing arbitrary ids. ↵Kim Alvefur2013-12-251-2/+6
| | | | | | | | | | | | | | | | Conflicting items are removed.
| * | | mod_storage_sql2: Include user, host and store in id lookupKim Alvefur2013-12-251-4/+6
| |/ /
* | | net.server_{select,event}: addclient: Handle missing getaddrinfoKim Alvefur2013-12-232-8/+4
| | |
* | | net.server_{select,event}: addclient: Use getaddrinfo to detect IP address ↵Kim Alvefur2013-12-232-2/+17
| | | | | | | | | | | | type if no socket type argument given. (Argument must be given for non-TCP)
* | | net.server_{select,event}: addclient: Add argument for overriding socket typeKim Alvefur2013-12-232-6/+22
| | |
* | | net/http: Use server.addclientdaurnimator2013-12-181-11/+6
| | |
* | | net/server: addclient: wrapclient already calls startconnection for usdaurnimator2013-12-181-2/+1
| | |
* | | net/server_event: pcall require ssl rather than relying on globalsdaurnimator2013-12-181-19/+11
| | |
* | | net/server_select: Fix typodaurnimator2013-12-181-1/+1
| | |
* | | net/server_select: addclient: Check argumentsdaurnimator2013-12-181-0/+15
| | |
* | | net/server_select: addclient: Check for failure correctly; remove ↵daurnimator2013-12-181-3/+3
| | | | | | | | | | | | wrapconnection call on failure
* | | net/server_event: add_client should have same arguments no-matter the server ↵daurnimator2013-12-181-21/+6
| | | | | | | | | | | | backend
* | | net/server_select: Check arguments to add_server correctlydaurnimator2013-12-181-3/+4
| | |
* | | net/server_select: pcall require ssl (easy to forget to require ssl)daurnimator2013-12-181-5/+5
| | |
* | | Merge 0.10->trunkKim Alvefur2013-12-181-1/+7
|\| |
| * | Merge 0.9->0.10Kim Alvefur2013-12-181-1/+7
| |\|
| | * mod_component: Enable TCP keepalives on component streamsKim Alvefur2013-12-181-0/+6
| | |
| | * mod_component: Decrease priority of component auth hookKim Alvefur2013-12-181-1/+1
| | |
* | | Merge 0.10->trunkMatthew Wild2013-12-162-6/+3
|\| |
| * | Merge 0.9->0.10Matthew Wild2013-12-162-6/+3
| |\|
| | * net.server_select: Don't remove the socket from sendlist when we might have ↵Matthew Wild2013-12-161-5/+1
| | | | | | | | | | | | data in the buffer (we'll now let sendbuffer() take care of that) (thanks daurnimator)
| | * net.http: assert() for socket creation success so it doesn't silently fail ↵Matthew Wild2013-12-161-1/+2
| | | | | | | | | | | | (thanks daurnimator)
* | | Merge with trunkMatthew Wild2013-12-160-0/+0
|\ \ \
| * \ \ Merge 0.10->trunkKim Alvefur2013-12-141-1/+1
| |\ \ \
* | \ \ \ Merge 0.10->trunkMatthew Wild2013-12-162-2/+5
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 15:28:17 +0000