aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | 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 non...Waqas Hussain2010-07-171-3/+5
|/ /
* | 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 well...Matthew Wild2010-07-161-11/+13
* | 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 method:...Waqas Hussain2010-07-152-2/+2
* | 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 'ssl'...Waqas Hussain2010-07-151-1/+1
* | util.sasl, util.sasl_cyrus: Use method:mechanisms() in method:select(), inste...Waqas Hussain2010-07-142-3/+2
* | util.sasl, util.sasl_cyrus: Updated method:mechanisms() to cache and re-use l...Waqas Hussain2010-07-142-12/+18
* | util.sasl: Use the proper session-specific table of mechanisms when selecting...Waqas Hussain2010-07-141-2/+2
* | 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 (fixes...Waqas Hussain2010-07-141-1/+3
* | 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
* | 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 file,...Matthew Wild2010-07-131-38/+48
* | prosody: Add prosody.resolve_relative_path() helper to change relative paths ...Matthew Wild2010-07-131-0/+17
* | mod_httpserver: Serve index.html if a request is made for a directory and it ...Matthew Wild2010-07-131-1/+10
* | configure: Make it possible to override ostype presets with values specified ...Matthew Wild2010-07-131-36/+32
* | configure: Fix ostype=freebsd for ./configure (thanks dersd for reporting and...Matthew Wild2010-07-131-1/+1
* | 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 caps...Waqas Hussain2010-07-111-28/+38
* | mod_adhoc: Add capability to pass data to formsFlorian Zeitz2010-07-101-2/+2
* | xmpp{client,server}_listener: Convert some calls to tail calls for efficiencyMatthew Wild2010-07-092-2/+2
* | mod_pep: Use util.capsMatthew Wild2010-07-091-46/+1
* | mod_disco: Support for putting the server's caps hash in stream:features to a...Matthew Wild2010-07-091-8/+38
* | util.caps: Entity capabilities hash generation (moved from mod_pep)Matthew Wild2010-07-091-0/+61
* | mod_posix: Some (perhaps temporary) changes to re-lock the pidfile after trun...Matthew Wild2010-07-091-2/+6