aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* rostermanager: Return an error string when subscription test fails due to an ↵Waqas Hussain2010-05-241-2/+2
| | | | error.
* rostermanager: Mark rosters which fail to load as broken, and never save them.Waqas Hussain2010-05-241-1/+2
|
* mod_presence: Removed a useless check when handling incoming presence probes ↵Waqas Hussain2010-05-241-4/+0
| | | | and subscriptions.
* util.datamanager: Return an error string when failing to save.Waqas Hussain2010-05-231-1/+1
|
* rostermanager: Correctly clear the bare_sessions table on roster load errors ↵Waqas Hussain2010-05-231-1/+1
| | | | during bind.
* rostermanager: Don't fire roster-load event if there was an error loading ↵Matthew Wild2010-05-221-1/+3
| | | | the roster
* sessionmanager: Change error for reaching resource limit from 'conflict' to ↵Waqas Hussain2010-05-221-1/+1
| | | | 'resource-constraint' during session bind.
* sessionmanager: If roster loading fails during resource bind, kick the user ↵Waqas Hussain2010-05-221-1/+13
| | | | with an internal-server-error.
* rostermanager: When loading the roster, also return a datamanager error if ↵Waqas Hussain2010-05-221-2/+3
| | | | available.
* util.datamanager: When failing to load a file, and the file exists, return ↵Waqas Hussain2010-05-221-4/+12
| | | | nil, error.
* 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 ↵Matthew Wild2010-05-211-30/+11
| | | | | | | | do this)
* | 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 ↵Matthew Wild2010-05-211-1/+3
| | | | | | | | encrypted even if they don't use HTTP (useful for when secure requests are proxied to Prosody over HTTP)
* | mod_privacy: Fix several possible tracebacks when either the contact is a ↵Matthew Wild2010-05-211-9/+14
| | | | | | | | host JID, or the contact isn't in your roster and you have roster group/subscription rules in place
* | mod_privacy: Remove validation that checks a roster group you block actually ↵Matthew Wild2010-05-211-20/+1
| | | | | | | | exists - it would be time-consuming on large rosters, and isn't important (or correct?) anyway.
* | mod_saslauth: Split out cyrus SASL config options into locals, and add ↵Matthew Wild2010-05-201-1/+10
| | | | | | | | support for cyrus_application_name (default: 'prosody')
* | usermanager, mod_saslauth: Make account provisioning for Cyrus SASL optional ↵Matthew Wild2010-05-202-5/+15
| | | | | | | | (default: not required)
* | util.sasl_cyrus: Support for specifying the application name (to pass to ↵Matthew Wild2010-05-201-2/+2
| | | | | | | | Cyrus SASL's init())
* | mod_saslauth: Add return value and error message to the Cyrus SASL ↵Matthew Wild2010-05-201-3/+4
| | | | | | | | handle_status callback
* | 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 ↵Waqas Hussain2010-05-071-0/+4
| | | | | | | | | | | | | | | | | | | | functions.
| * | | | 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' ↵Waqas Hussain2010-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | mode is enabled in the config.
* | | | | | Merge with 0.6Matthew Wild2010-05-174-25/+28
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | |
| * | | | mod_bosh: Always give requests a destroy handler, so that the management of ↵Matthew Wild2010-05-171-13/+15
| | | | | | | | | | | | | | | | | | | | each session's request array and the inactive_sessions logic can happen in one place. Simplifies everything and concludes this series of BOSH fixes.
| * | | | mod_bosh: Fix handling of rids by not dropping requests with repeated rids ↵Matthew Wild2010-05-171-2/+3
| | | | | | | | | | | | | | | | | | | | (assign them their sid instead), and always starting a session with first_rid-1.
| * | | | mod_bosh: Remove some hacky code for pruning dead requests that hopefully ↵Matthew Wild2010-05-171-5/+0
| | | | | | | | | | | | | | | | | | | | never gets executed - if it does there's a bug anyway.
| * | | | mod_bosh: Remove requests from the session table using table.remove(), ↵Matthew Wild2010-05-171-2/+5
| | |/ / | |/| | | | | | | | | | prevents the possibility of holes in the array.
| * | | 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' ↵Waqas Hussain2010-05-061-1/+1
| | | | | | | | | | | | mode is enabled in the config.
* | | mod_console: Make use of the new onconnect callback to initialise session ↵Matthew Wild2010-05-051-62/+62
| | | | | | | | | | | | and send banner
* | | net.server_select: Fix typo affecting connections with an onconnect listener ↵Matthew Wild2010-05-051-1/+1
| | | | | | | | | | | | that have data pending in the sendbuffer
* | | mod_proxy65: Send error reply to activation stanza if one or both parties ↵Matthew Wild2010-05-051-0/+10
| | | | | | | | | | | | were not connected to the proxy
* | | mod_proxy65: Return service-unavailable error when receiving an iq we didn't ↵Matthew Wild2010-05-051-0/+3
| | | | | | | | | | | | understand