Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 0.9->trunk | Matthew Wild | 2012-07-08 | 1 | -0/+6 |
|\ | |||||
| * | util.pposix: Add comments to mallinfo fields we use, so I don't forget ↵ | Matthew Wild | 2012-07-08 | 1 | -0/+6 |
| | | | | | | | | tomorrow what they mean | ||||
* | | Merge 0.9->trunk | Matthew Wild | 2012-07-08 | 3 | -36/+52 |
|\ \ | |/ |/| | |||||
| * | Merge 0.9->trunk | Matthew Wild | 2012-07-07 | 2 | -3/+4 |
| |\ | |||||
| * \ | Merge 0.9->trunk | Matthew Wild | 2012-07-05 | 0 | -0/+0 |
| |\ \ | |||||
| * \ \ | Merge 0.9->trunk | Matthew Wild | 2012-07-05 | 7 | -8/+40 |
| |\ \ \ | |||||
| * | | | | mod_admin_web: Use util.dataforms' own error checking | Florian Zeitz | 2012-07-05 | 1 | -34/+50 |
| | | | | | |||||
| * | | | | mod_dialback: Skip an unnecessary nameprep. | Waqas Hussain | 2012-06-15 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | s2smanager: Fix a traceback when we close a s2s connection ourselves (thanks ↵ | Waqas Hussain | 2012-06-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | for the testing Zash). | ||||
* | | | | | Merge with backout | Matthew Wild | 2012-07-08 | 1 | -2/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Backed out changeset 72a2eec4204a (incomplete fix) | Matthew Wild | 2012-07-08 | 1 | -2/+1 |
| | |_|_|/ | |/| | | | |||||
* / | | | | util.pposix: Add meminfo() binding to memory allocation stats provided by ↵ | Matthew Wild | 2012-07-08 | 1 | -0/+28 |
|/ / / / | | | | | | | | | | | | | mallinfo() [compilation tested on Ubuntu...] | ||||
* | | | | mod_auth_anonymous: Attach a fake roster to the session, so the null storage ↵ | Kim Alvefur | 2012-07-07 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | backend can be used | ||||
* | | | | usermanager: Pass session on to auth provider (missing half of commit ↵ | Matthew Wild | 2012-07-07 | 1 | -2/+2 |
| |_|/ |/| | | | | | | | | 0545a574667b) (thanks Zash) | ||||
* | | | Merge (some of) trunk -> 0.9 | Matthew Wild | 2012-07-05 | 2 | -11/+19 |
|\| | | |/ |/| | |||||
| * | Merge 0.9->trunk | Matthew Wild | 2012-06-12 | 1 | -5/+5 |
| |\ | |||||
| * \ | Merge with trunk | Matthew Wild | 2012-06-12 | 3 | -15/+16 |
| |\ \ | |||||
| * | | | certmanager: Add quotes around cert file path when logging. | Waqas Hussain | 2012-06-12 | 1 | -1/+1 |
| | | | | |||||
| * | | | MUC: Handle missing persistent room data. | Waqas Hussain | 2012-06-12 | 1 | -10/+18 |
| | | | | |||||
* | | | | mod_saslauth: Pass session to usermanager.get_sasl_handler() | Matthew Wild | 2012-07-04 | 1 | -2/+2 |
| | | | | |||||
* | | | | TODO: Add statistics | Matthew Wild | 2012-07-04 | 1 | -0/+1 |
| | | | | |||||
* | | | | util.logger: Remove some redundant code | Matthew Wild | 2012-06-25 | 1 | -2/+0 |
| | | | | |||||
* | | | | util.stanza: Make stanza:childtags() behave like :get_child() | Kim Alvefur | 2012-07-05 | 1 | -2/+2 |
| | | | | |||||
* | | | | prosodyctl: Fix typo | Kim Alvefur | 2012-07-03 | 1 | -1/+1 |
| | | | | |||||
* | | | | util.pposix: Add setenv() | Kim Alvefur | 2012-07-03 | 1 | -0/+33 |
| | | | | |||||
* | | | | util.sasl: Make registerMechanism a public function | Matthew Wild | 2012-06-18 | 1 | -1/+1 |
| |_|/ |/| | | |||||
* | | | util.dataforms: Fix parsing of -multi fields | Florian Zeitz | 2012-06-12 | 1 | -5/+5 |
| |/ |/| | |||||
* | | mod_adhoc, mod_admin_adhoc, mod_announce: Use module:provides() to manage ↵ | Florian Zeitz | 2012-06-12 | 3 | -15/+16 |
|/ | | | | Ad-Hoc commands | ||||
* | mod_s2s: Remove check for socket.tcp6() | Kim Alvefur | 2012-05-29 | 1 | -4/+0 |
| | |||||
* | mod_s2s: Only do AAAA lookup if IPv6 is available, and A if IPv4 is available. | Kim Alvefur | 2012-05-29 | 1 | -1/+17 |
| | |||||
* | mod_proxy65: Fix ACL | Kim Alvefur | 2012-05-29 | 1 | -1/+3 |
| | |||||
* | util.sasl.plain: make it return "not-authorized" in case of non-existant ↵ | Marco Cirillo | 2012-05-28 | 1 | -1/+3 |
| | | | | accounts instead of "account-disabled" to avoid enumeration. | ||||
* | stanza_router: Also don't bounce <iq type='result'> | Matthew Wild | 2012-05-27 | 1 | -1/+1 |
| | |||||
* | stanza_router: Don't bounce type=error stanzas | Kim Alvefur | 2012-05-27 | 1 | -0/+2 |
| | |||||
* | mod_proxy65: Add missing import of portmanager | Kim Alvefur | 2012-05-27 | 1 | -0/+1 |
| | |||||
* | mod_proxy65: Warn about pre-0.9 config style (per host proxy65_port) | Kim Alvefur | 2012-05-27 | 1 | -1/+7 |
| | |||||
* | mod_http: Fix traceback when no HTTP services succeed in binding | Matthew Wild | 2012-05-26 | 1 | -1/+1 |
| | |||||
* | DEPENDS: Add luafilesystem (thanks Zash) | Matthew Wild | 2012-05-26 | 1 | -0/+1 |
| | |||||
* | mod_admin_telnet: More code found and updated, which depended on ↵ | Kim Alvefur | 2012-05-25 | 1 | -1/+1 |
| | | | | pre-8c5b5ebaacb0 behaviour. | ||||
* | mod_admin_telnet: Code found and updated, which depended on pre-8c5b5ebaacb0 ↵ | Kim Alvefur | 2012-05-25 | 1 | -1/+1 |
| | | | | behaviour. | ||||
* | mod_http: Fix normalize_path('/') to not return an empty string, fixes ↵ | Kim Alvefur | 2012-05-25 | 1 | -1/+1 |
| | | | | module:http_url() | ||||
* | net.http.parser: Break loop when no more usable data in buffer | Matthew Wild | 2012-05-25 | 1 | -0/+2 |
| | |||||
* | mod_watchregistrations: Convert JID list to a set, and prep before use to ↵ | Matthew Wild | 2012-05-24 | 1 | -2/+3 |
| | | | | fix traceback on invalid JIDs (thanks sMi) | ||||
* | util.set: Change '/' operator from filter to map+filter (nil to drop from ↵ | Matthew Wild | 2012-05-24 | 1 | -2/+3 |
| | | | | set, false is a valid item). No code found which depends on current behaviour. | ||||
* | net.server_event: Internal changes to get plain-SSL outgoing connections ↵ | Matthew Wild | 2012-05-24 | 1 | -3/+3 |
| | | | | working (as for HTTPS) | ||||
* | mod_s2s, s2sout.lib: Send stream header in onconnect() | Matthew Wild | 2012-05-24 | 2 | -4/+5 |
| | |||||
* | net.server_event: Assume wrapclient() is taking a new connection, and call ↵ | Matthew Wild | 2012-05-24 | 1 | -1/+1 |
| | | | | onconnect when appropriate (to match server_select) | ||||
* | net.server_select: Don't close client connections when closing a server (it ↵ | Matthew Wild | 2012-05-23 | 1 | -7/+1 |
| | | | | wasn't working anyway) | ||||
* | net.server_select: Call ondisconnect handler, even if we closed the socket ↵ | Matthew Wild | 2012-05-23 | 1 | -0/+4 |
| | | | | ourselves (fixes HTTP session hoarding, thanks Maranda) | ||||
* | portmanager: Match service against service_info (:iter() doesn't match values) | Matthew Wild | 2012-05-22 | 1 | -2/+5 |
| |