aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* sessionmanager: If roster loading fails during resource bind, kick the user w...Waqas Hussain2010-05-221-1/+13
* rostermanager: When loading the roster, also return a datamanager error if av...Waqas Hussain2010-05-221-2/+3
* util.datamanager: When failing to load a file, and the file exists, return ni...Waqas Hussain2010-05-221-4/+12
* mod_privacy: Improved logging.Waqas Hussain2010-05-221-8/+8
* mod_presence: Added option 'ignore_presence_priority'.Waqas Hussain2010-05-221-0/+10
* Merge with backoutMatthew Wild2010-05-211-30/+11
|\
| * Backed out changeset c75c22c316d6 (the XMPP spec now gives a better way to do...Matthew Wild2010-05-211-30/+11
* | mod_bosh: Re-layout session object creation to make lines shorterMatthew Wild2010-05-211-4/+8
* | mod_bosh: Add option consider_bosh_secure to treat BOSH sessions as encrypted...Matthew Wild2010-05-211-1/+3
* | mod_privacy: Fix several possible tracebacks when either the contact is a hos...Matthew Wild2010-05-211-9/+14
* | mod_privacy: Remove validation that checks a roster group you block actually ...Matthew Wild2010-05-211-20/+1
* | mod_saslauth: Split out cyrus SASL config options into locals, and add suppor...Matthew Wild2010-05-201-1/+10
* | usermanager, mod_saslauth: Make account provisioning for Cyrus SASL optional ...Matthew Wild2010-05-202-5/+15
* | util.sasl_cyrus: Support for specifying the application name (to pass to Cyru...Matthew Wild2010-05-201-2/+2
* | mod_saslauth: Add return value and error message to the Cyrus SASL handle_sta...Matthew Wild2010-05-201-3/+4
* | mod_saslauth: Allow the Cyrus SASL realm to be configurableMatthew Wild2010-05-201-1/+1
* | net.dns: Remove redundant locals declarationMatthew Wild2010-05-201-1/+0
* | net.dns: Fix dns.lookup from commit e54774bd73a7Matthew Wild2010-05-201-1/+1
* | mod_groups: Remove potentially verbose per-contact logging (thanks Flo)Matthew Wild2010-05-201-3/+3
* | Merge 0.6->0.7Matthew Wild2010-05-181-1/+1
|\ \
| * | configure: Fix to allow option values containing '=' (thanks Jakub)Matthew Wild2010-05-181-1/+1
* | | net/dns: Fix socket.select timeout.Brian Cully2009-12-281-1/+8
* | | Merge 0.6->0.7Matthew Wild2010-05-181-1/+1
|\| |
| * | net/httpserver_listener: Ignore empty strings on incoming data.Brian Cully2010-04-281-1/+1
* | | Merge 0.7/MattJ with 0.7Matthew Wild2010-05-172-1/+6
|\ \ \
| * \ \ Merge 0.6->0.7Waqas Hussain2010-05-072-2/+4
| |\ \ \
| * | | | mod_console: Ensure that a null byte is printed after sending the banner.Waqas Hussain2010-05-071-0/+1
| * | | | prosody: Modified function metatable for better string representation of func...Waqas Hussain2010-05-071-0/+4
| * | | | prosody: Lowered log level for a log message.Waqas Hussain2010-05-071-1/+1
| * | | | Merge 0.6->0.7Waqas Hussain2010-05-060-0/+0
| |\ \ \ \
| * | | | | loggingmanager: Enable debug level for default console logging when 'debug' m...Waqas Hussain2010-05-061-1/+1
* | | | | | Merge with 0.6Matthew Wild2010-05-174-25/+28
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | |
| * | | | mod_bosh: Always give requests a destroy handler, so that the management of e...Matthew Wild2010-05-171-13/+15
| * | | | mod_bosh: Fix handling of rids by not dropping requests with repeated rids (a...Matthew Wild2010-05-171-2/+3
| * | | | mod_bosh: Remove some hacky code for pruning dead requests that hopefully nev...Matthew Wild2010-05-171-5/+0
| * | | | mod_bosh: Remove requests from the session table using table.remove(), preven...Matthew Wild2010-05-171-2/+5
| | |/ / | |/| |
| * | | mod_console: Set a chunk name for loadstring calls (nicer errors).Waqas Hussain2010-05-071-2/+3
| * | | mod_posix: Fixed a global access.Waqas Hussain2010-05-071-0/+1
| |/ /
| * | loggingmanager: Enable debug level for default console logging when 'debug' m...Waqas Hussain2010-05-061-1/+1
* | | mod_console: Make use of the new onconnect callback to initialise session and...Matthew Wild2010-05-051-62/+62
* | | net.server_select: Fix typo affecting connections with an onconnect listener ...Matthew Wild2010-05-051-1/+1
* | | mod_proxy65: Send error reply to activation stanza if one or both parties wer...Matthew Wild2010-05-051-0/+10
* | | mod_proxy65: Return service-unavailable error when receiving an iq we didn't ...Matthew Wild2010-05-051-0/+3
* | | mod_proxy65: Use new server.link to link proxied connections, now works with ...Matthew Wild2010-05-051-24/+4
* | | net.server_select, net.server_event: Add server.link() to link 2 connections ...Matthew Wild2010-05-052-0/+44
* | | net.server_select, net.server_event: Support for ondrain listener callback fo...Matthew Wild2010-05-052-1/+9
* | | net.server_select, net.server_event: Rename :pattern() method to :set_mode() ...Matthew Wild2010-05-052-2/+9
* | | net.server_select, net.server_event: Support for :pause() and :resume() on co...Matthew Wild2010-05-052-1/+21
* | | net.server_event: Be sure to fire onincoming for backwards-compatibility with...Matthew Wild2010-05-051-1/+2
* | | Merge 0.6 into 0.7.Waqas Hussain2010-05-014-129/+118
|\| |