Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge Zash->trunk | Matthew Wild | 2010-07-16 | 2 | -0/+24 |
|\ | |||||
| * | util.jid: compare() added, with some tests. | Kim Alvefur | 2010-07-16 | 2 | -0/+24 |
| | | |||||
* | | util.sasl.scram: Reference actual RFC instead of the draft. | Tobias Markmann | 2010-07-15 | 1 | -1/+1 |
|/ | |||||
* | util.sasl, util.sasl_cyrus: s/self.mechanisms()/self:mechanisms()/ in ↵ | Waqas Hussain | 2010-07-15 | 2 | -2/+2 |
| | | | | method:select(). | ||||
* | Merge with backout | Matthew Wild | 2010-07-15 | 1 | -1/+1 |
|\ | |||||
| * | Backed out changeset 598c33a99a31 (already fixed a better way) | Matthew Wild | 2010-07-15 | 1 | -1/+1 |
| | | |||||
* | | certmanager: Fix to handle the case of no SSL configuration at all | Matthew Wild | 2010-07-14 | 1 | -2/+2 |
| | | |||||
* | | certmanager: Added copyright header. | Waqas Hussain | 2010-07-15 | 1 | -0/+8 |
| | | |||||
* | | certmanager: Defined default_capath to prevent a global nil access. | Waqas Hussain | 2010-07-15 | 1 | -0/+1 |
|/ | |||||
* | certmanager: Use an empty table as the default ssl config when a global ↵ | Waqas Hussain | 2010-07-15 | 1 | -1/+1 |
| | | | | 'ssl' config option isn't specified (fixes a top-level traceback on startup). | ||||
* | util.sasl, util.sasl_cyrus: Use method:mechanisms() in method:select(), ↵ | Waqas Hussain | 2010-07-14 | 2 | -3/+2 |
| | | | | instead of using the mechanisms list directly (fixes a traceback). | ||||
* | util.sasl, util.sasl_cyrus: Updated method:mechanisms() to cache and re-use ↵ | Waqas Hussain | 2010-07-14 | 2 | -12/+18 |
| | | | | list of mechanisms. | ||||
* | util.sasl: Use the proper session-specific table of mechanisms when ↵ | Waqas Hussain | 2010-07-14 | 1 | -2/+2 |
| | | | | selecting a mechanism, and not the global table. | ||||
* | SASL: Simplified sasl_handler:mechanisms() to return a set, and not an array. | Waqas Hussain | 2010-07-14 | 3 | -4/+4 |
| | |||||
* | usermanager: Return a non-nil SASL handler from the null auth provider ↵ | Waqas Hussain | 2010-07-14 | 1 | -1/+3 |
| | | | | (fixes a traceback). | ||||
* | MUC: Fixed a traceback introduced in hg:bdc325ce9fbc. | Waqas Hussain | 2010-07-14 | 1 | -2/+2 |
| | |||||
* | net.dns: Call :cancel() on the current resolver instead of the prototype | Matthew Wild | 2010-07-14 | 1 | -1/+1 |
| | |||||
* | util.roster: Initial skeleton commit | Matthew Wild | 2010-07-14 | 1 | -0/+19 |
| | |||||
* | loggingmanager: Add reload_logging() method, which gets called on any config ↵ | Matthew Wild | 2010-07-14 | 1 | -11/+35 |
| | | | | reload, to reset util.logger and remove and re-add all sink types to perform a full reload of the logging system without a restart. | ||||
* | util.logger: Add reset() method to clear all sinks | Matthew Wild | 2010-07-14 | 1 | -0/+15 |
| | |||||
* | certmanager: Remove debug logging accidentally committed | Matthew Wild | 2010-07-13 | 1 | -2/+0 |
| | |||||
* | certmanager: Adjust paths of SSL key/certs to be relative to the config ↵ | Matthew Wild | 2010-07-13 | 1 | -38/+48 |
| | | | | file, fixes #147 | ||||
* | prosody: Add prosody.resolve_relative_path() helper to change relative paths ↵ | Matthew Wild | 2010-07-13 | 1 | -0/+17 |
| | | | | to be relative to the config file | ||||
* | mod_httpserver: Serve index.html if a request is made for a directory and it ↵ | Matthew Wild | 2010-07-13 | 1 | -1/+10 |
| | | | | contains one (thanks Brian Cully) | ||||
* | configure: Make it possible to override ostype presets with values specified ↵ | Matthew Wild | 2010-07-13 | 1 | -36/+32 |
| | | | | later on the command-line | ||||
* | configure: Fix ostype=freebsd for ./configure (thanks dersd for reporting ↵ | Matthew Wild | 2010-07-13 | 1 | -1/+1 |
| | | | | and n0nsense for testing the fix!) | ||||
* | mod_saslauth: Rename variable 'aret' to 'ok' as per convention | Matthew Wild | 2010-07-12 | 1 | -2/+2 |
| | |||||
* | mod_disco: Reflect requested 'node' attribute in the disco#info reply. | Waqas Hussain | 2010-07-12 | 1 | -1/+3 |
| | |||||
* | mod_disco: Respond to disco#info to the correct caps hash node ("node#ver"). | Waqas Hussain | 2010-07-11 | 1 | -1/+1 |
| | |||||
* | mod_disco: Cache disco#info reply and caps hash for host, return correct ↵ | Waqas Hussain | 2010-07-11 | 1 | -28/+38 |
| | | | | caps hash, and respond to disco#info to the caps hash node. | ||||
* | mod_adhoc: Add capability to pass data to forms | Florian Zeitz | 2010-07-10 | 1 | -2/+2 |
| | |||||
* | xmpp{client,server}_listener: Convert some calls to tail calls for efficiency | Matthew Wild | 2010-07-09 | 2 | -2/+2 |
| | |||||
* | mod_pep: Use util.caps | Matthew Wild | 2010-07-09 | 1 | -46/+1 |
| | |||||
* | mod_disco: Support for putting the server's caps hash in stream:features to ↵ | Matthew Wild | 2010-07-09 | 1 | -8/+38 |
| | | | | allow the client to cache disco#info for the server instead of requesting it at each login. | ||||
* | util.caps: Entity capabilities hash generation (moved from mod_pep) | Matthew Wild | 2010-07-09 | 1 | -0/+61 |
| | |||||
* | mod_posix: Some (perhaps temporary) changes to re-lock the pidfile after ↵ | Matthew Wild | 2010-07-09 | 1 | -2/+6 |
| | | | | truncating, to avoid breaking prosodyctl | ||||
* | mod_posix: Truncate the pidfile before writing to ensure that we never ↵ | Brian Cully | 2010-07-09 | 1 | -0/+5 |
| | | | | overwrite with a PID shorter than the previous, and end with an invalid PID in the file. | ||||
* | prosodyctl: Warn and exit if any log files are not writeable, fixes #94 | Matthew Wild | 2010-07-09 | 1 | -1/+40 |
| | |||||
* | prosodyctl: Force log output always to the console instead of using the ↵ | Matthew Wild | 2010-07-08 | 1 | -0/+2 |
| | | | | config, which avoids creating log files as the wrong user | ||||
* | prosodyctl: Remove warnings when using a non-standard auth provider, ↵ | Matthew Wild | 2010-07-08 | 1 | -18/+0 |
| | | | | prosodyctl now works with any auth provider | ||||
* | mod_auth_internal, usermanager: Rename to mod_auth_internal_plain, and ↵ | Matthew Wild | 2010-07-08 | 2 | -3/+3 |
| | | | | update usermanager to still use it as the default | ||||
* | mod_auth_internal, mod_auth_internal_hashed: Remove checking for nil or ↵ | Matthew Wild | 2010-07-08 | 2 | -8/+0 |
| | | | | empty password and pretending it means the user doesn't exist. Hopefully with more success than Custer. | ||||
* | util-src/Makefile: Stop linking dynamic libraries to Lua, it isn't necessary ↵ | Matthew Wild | 2010-07-08 | 1 | -1/+1 |
| | | | | as symbols are exported from the Lua binary (thanks deryni) | ||||
* | xmppserver_listener: Fix variable names I forgot to change in the last commit | Matthew Wild | 2010-07-08 | 1 | -1/+1 |
| | |||||
* | xmpp{client,server}_listener: Put stanzas/in filtering code in the correct ↵ | Matthew Wild | 2010-07-08 | 2 | -14/+14 |
| | | | | place to make it actually work :) | ||||
* | util.filters: Add newline at end of file | Matthew Wild | 2010-07-08 | 1 | -1/+1 |
| | |||||
* | MUC: Make number of stored history messages configurable with option ↵ | Matthew Wild | 2010-07-06 | 2 | -7/+18 |
| | | | | max_history_messages (thanks michal and others who requested) | ||||
* | s2smanager: Lower default DNS timeout to 15s (it's now a per-DNS-server ↵ | Matthew Wild | 2010-07-05 | 1 | -15/+3 |
| | | | | timeout, rather than total timeout), use net.dns's new timeout system, and remove our custom timeout handlers | ||||
* | net.dns: Add dns.settimeout() to set the timeout for the default resolver | Matthew Wild | 2010-07-05 | 1 | -0/+4 |
| | |||||
* | net.dns: Make timeout configurable (default 15s) | Matthew Wild | 2010-07-05 | 1 | -4/+9 |
| |