aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* net.server_event: Fix to not call onconnect a second time after the SSL ↵Matthew Wild2010-07-221-17/+19
| | | | handshake for starttls connections (thanks Flo)
* usermanager, mod_auth_internal_hashed, mod_legacyauth: New order of ↵Matthew Wild2010-07-213-3/+3
| | | | parameters for usermanager.test_password - username, host, password
* mod_register: Drop useless depencency on datamanager.Waqas Hussain2010-07-201-1/+0
|
* MUC: Store the nick (full room JID) which set the subject, and send subject ↵Waqas Hussain2010-07-201-1/+2
| | | | to occupants from that JID.
* util.iterators: Add skip() to skip the first n items of an iteratorMatthew Wild2010-07-201-0/+9
|
* mod_saslauth: Got rid of undocumented and useless 'sasl_realm' config option ↵Waqas Hussain2010-07-181-2/+1
| | | | (was only used for anonymous auth, and that didn't make sense).
* Merge with trunk.Waqas Hussain2010-07-172-2/+1
|\
| * MUC: No need to call is_admin twice now, global admins are admins on hostsMatthew Wild2010-07-171-1/+1
| |
| * net.server_event: Remove debug logging from dummy onstatus handlerMatthew Wild2010-07-171-1/+0
| |
* | mod_auth_internal_hashed: Fixed SCRAM-SHA-1 mechanism to not traceback on ↵Waqas Hussain2010-07-171-3/+5
|/ | | | non-existent users.
* mod_saslauth: Cleaned up unused requires.Waqas Hussain2010-07-171-7/+0
|
* mod_saslauth: A little cleanup for anonymous_login.Waqas Hussain2010-07-171-2/+3
|
* configmanager: Remove dependency on eventmanager, and global 'prosody' objectMatthew Wild2010-07-171-2/+2
|
* s2smanager: Handle disallow_s2s for incoming streams as well as outgoingMatthew Wild2010-07-161-4/+16
|
* net.server_select: Ensure that onconnect is called for server sockets as ↵Matthew Wild2010-07-161-11/+13
| | | | well as clients, rather than onincoming. Fixes mod_console traceback, issue #197
* Merge Florob->trunkMatthew Wild2010-07-161-0/+27
|\
| * util.dataforms: Add list-multi supportFlorian Zeitz2010-07-151-0/+22
| |
| * util.dataforms: Capability to set default for list-singleFlorian Zeitz2010-07-151-0/+5
| |
* | Merge Zash->trunkMatthew Wild2010-07-161-18/+5
|\ \
| * | mod_proxy65: Use util.jid.compare() and remove some clutterKim Alvefur2010-07-161-18/+5
| | |
* | | Merge Zash->trunkMatthew Wild2010-07-162-0/+24
|\| | | |/ |/|
| * util.jid: compare() added, with some tests.Kim Alvefur2010-07-162-0/+24
| |
* | util.sasl.scram: Reference actual RFC instead of the draft.Tobias Markmann2010-07-151-1/+1
|/
* util.sasl, util.sasl_cyrus: s/self.mechanisms()/self:mechanisms()/ in ↵Waqas Hussain2010-07-152-2/+2
| | | | method:select().
* Merge with backoutMatthew Wild2010-07-151-1/+1
|\
| * Backed out changeset 598c33a99a31 (already fixed a better way)Matthew Wild2010-07-151-1/+1
| |
* | certmanager: Fix to handle the case of no SSL configuration at allMatthew Wild2010-07-141-2/+2
| |
* | certmanager: Added copyright header.Waqas Hussain2010-07-151-0/+8
| |
* | certmanager: Defined default_capath to prevent a global nil access.Waqas Hussain2010-07-151-0/+1
|/
* certmanager: Use an empty table as the default ssl config when a global ↵Waqas Hussain2010-07-151-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 Hussain2010-07-142-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 Hussain2010-07-142-12/+18
| | | | list of mechanisms.
* util.sasl: Use the proper session-specific table of mechanisms when ↵Waqas Hussain2010-07-141-2/+2
| | | | selecting a mechanism, and not the global table.
* SASL: Simplified sasl_handler:mechanisms() to return a set, and not an array.Waqas Hussain2010-07-143-4/+4
|
* usermanager: Return a non-nil SASL handler from the null auth provider ↵Waqas Hussain2010-07-141-1/+3
| | | | (fixes a traceback).
* MUC: Fixed a traceback introduced in hg:bdc325ce9fbc.Waqas Hussain2010-07-141-2/+2
|
* net.dns: Call :cancel() on the current resolver instead of the prototypeMatthew Wild2010-07-141-1/+1
|
* util.roster: Initial skeleton commitMatthew Wild2010-07-141-0/+19
|
* loggingmanager: Add reload_logging() method, which gets called on any config ↵Matthew Wild2010-07-141-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 sinksMatthew Wild2010-07-141-0/+15
|
* certmanager: Remove debug logging accidentally committedMatthew Wild2010-07-131-2/+0
|
* certmanager: Adjust paths of SSL key/certs to be relative to the config ↵Matthew Wild2010-07-131-38/+48
| | | | file, fixes #147
* prosody: Add prosody.resolve_relative_path() helper to change relative paths ↵Matthew Wild2010-07-131-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 Wild2010-07-131-1/+10
| | | | contains one (thanks Brian Cully)
* configure: Make it possible to override ostype presets with values specified ↵Matthew Wild2010-07-131-36/+32
| | | | later on the command-line
* configure: Fix ostype=freebsd for ./configure (thanks dersd for reporting ↵Matthew Wild2010-07-131-1/+1
| | | | and n0nsense for testing the fix!)
* mod_saslauth: Rename variable 'aret' to 'ok' as per conventionMatthew Wild2010-07-121-2/+2
|
* mod_disco: Reflect requested 'node' attribute in the disco#info reply.Waqas Hussain2010-07-121-1/+3
|
* mod_disco: Respond to disco#info to the correct caps hash node ("node#ver").Waqas Hussain2010-07-111-1/+1
|
* mod_disco: Cache disco#info reply and caps hash for host, return correct ↵Waqas Hussain2010-07-111-28/+38
| | | | caps hash, and respond to disco#info to the caps hash node.