aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge 0.9->trunkMatthew Wild2012-07-091-1/+2
|\
| * util.throttle: floor() internal balance calculationMatthew Wild2012-07-091-1/+2
* | Merge 0.9->trunkMatthew Wild2012-07-081-0/+6
|\|
| * util.pposix: Add comments to mallinfo fields we use, so I don't forget tomorr...Matthew Wild2012-07-081-0/+6
* | Merge 0.9->trunkMatthew Wild2012-07-083-36/+52
|\ \ | |/ |/|
| * Merge 0.9->trunkMatthew Wild2012-07-072-3/+4
| |\
| * \ Merge 0.9->trunkMatthew Wild2012-07-050-0/+0
| |\ \
| * \ \ Merge 0.9->trunkMatthew Wild2012-07-057-8/+40
| |\ \ \
| * | | | mod_admin_web: Use util.dataforms' own error checkingFlorian Zeitz2012-07-051-34/+50
| * | | | mod_dialback: Skip an unnecessary nameprep.Waqas Hussain2012-06-151-1/+1
| * | | | s2smanager: Fix a traceback when we close a s2s connection ourselves (thanks ...Waqas Hussain2012-06-131-1/+1
* | | | | Merge with backoutMatthew Wild2012-07-081-2/+1
|\ \ \ \ \
| * | | | | Backed out changeset 72a2eec4204a (incomplete fix)Matthew Wild2012-07-081-2/+1
| | |_|_|/ | |/| | |
* / | | | util.pposix: Add meminfo() binding to memory allocation stats provided by mal...Matthew Wild2012-07-081-0/+28
|/ / / /
* | | | mod_auth_anonymous: Attach a fake roster to the session, so the null storage ...Kim Alvefur2012-07-071-1/+2
* | | | usermanager: Pass session on to auth provider (missing half of commit 0545a57...Matthew Wild2012-07-071-2/+2
| |_|/ |/| |
* | | Merge (some of) trunk -> 0.9Matthew Wild2012-07-052-11/+19
|\| | | |/ |/|
| * Merge 0.9->trunkMatthew Wild2012-06-121-5/+5
| |\
| * \ Merge with trunkMatthew Wild2012-06-123-15/+16
| |\ \
| * | | certmanager: Add quotes around cert file path when logging.Waqas Hussain2012-06-121-1/+1
| * | | MUC: Handle missing persistent room data.Waqas Hussain2012-06-121-10/+18
* | | | mod_saslauth: Pass session to usermanager.get_sasl_handler()Matthew Wild2012-07-041-2/+2
* | | | TODO: Add statisticsMatthew Wild2012-07-041-0/+1
* | | | util.logger: Remove some redundant codeMatthew Wild2012-06-251-2/+0
* | | | util.stanza: Make stanza:childtags() behave like :get_child()Kim Alvefur2012-07-051-2/+2
* | | | prosodyctl: Fix typoKim Alvefur2012-07-031-1/+1
* | | | util.pposix: Add setenv()Kim Alvefur2012-07-031-0/+33
* | | | util.sasl: Make registerMechanism a public functionMatthew Wild2012-06-181-1/+1
| |_|/ |/| |
* | | util.dataforms: Fix parsing of -multi fieldsFlorian Zeitz2012-06-121-5/+5
| |/ |/|
* | mod_adhoc, mod_admin_adhoc, mod_announce: Use module:provides() to manage Ad-...Florian Zeitz2012-06-123-15/+16
|/
* mod_s2s: Remove check for socket.tcp6()Kim Alvefur2012-05-291-4/+0
* mod_s2s: Only do AAAA lookup if IPv6 is available, and A if IPv4 is available.Kim Alvefur2012-05-291-1/+17
* mod_proxy65: Fix ACLKim Alvefur2012-05-291-1/+3
* util.sasl.plain: make it return "not-authorized" in case of non-existant acco...Marco Cirillo2012-05-281-1/+3
* stanza_router: Also don't bounce <iq type='result'>Matthew Wild2012-05-271-1/+1
* stanza_router: Don't bounce type=error stanzasKim Alvefur2012-05-271-0/+2
* mod_proxy65: Add missing import of portmanagerKim Alvefur2012-05-271-0/+1
* mod_proxy65: Warn about pre-0.9 config style (per host proxy65_port)Kim Alvefur2012-05-271-1/+7
* mod_http: Fix traceback when no HTTP services succeed in bindingMatthew Wild2012-05-261-1/+1
* DEPENDS: Add luafilesystem (thanks Zash)Matthew Wild2012-05-261-0/+1
* mod_admin_telnet: More code found and updated, which depended on pre-8c5b5eba...Kim Alvefur2012-05-251-1/+1
* mod_admin_telnet: Code found and updated, which depended on pre-8c5b5ebaacb0 ...Kim Alvefur2012-05-251-1/+1
* mod_http: Fix normalize_path('/') to not return an empty string, fixes module...Kim Alvefur2012-05-251-1/+1
* net.http.parser: Break loop when no more usable data in bufferMatthew Wild2012-05-251-0/+2
* mod_watchregistrations: Convert JID list to a set, and prep before use to fix...Matthew Wild2012-05-241-2/+3
* util.set: Change '/' operator from filter to map+filter (nil to drop from set...Matthew Wild2012-05-241-2/+3
* net.server_event: Internal changes to get plain-SSL outgoing connections work...Matthew Wild2012-05-241-3/+3
* mod_s2s, s2sout.lib: Send stream header in onconnect()Matthew Wild2012-05-242-4/+5
* net.server_event: Assume wrapclient() is taking a new connection, and call on...Matthew Wild2012-05-241-1/+1
* net.server_select: Don't close client connections when closing a server (it w...Matthew Wild2012-05-231-7/+1