aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | mod_proxy65: Use new server.link to link proxied connections, now works with ↵Matthew Wild2010-05-051-24/+4
| | | | | | | | either connection backend
* | net.server_select, net.server_event: Add server.link() to link 2 connections ↵Matthew Wild2010-05-052-0/+44
| | | | | | | | with an intermediate buffer of the specified size
* | net.server_select, net.server_event: Support for ondrain listener callback ↵Matthew Wild2010-05-052-1/+9
| | | | | | | | for when send buffer is empty
* | net.server_select, net.server_event: Rename :pattern() method to :set_mode() ↵Matthew Wild2010-05-052-2/+9
| | | | | | | | for select backend, and add :set_mode() to event backend
* | net.server_select, net.server_event: Support for :pause() and :resume() on ↵Matthew Wild2010-05-052-1/+21
| | | | | | | | connections
* | net.server_event: Be sure to fire onincoming for backwards-compatibility ↵Matthew Wild2010-05-051-1/+2
| | | | | | | | with pre-onconnect listeners (thanks darkrain/mod_console)
* | Merge 0.6 into 0.7.Waqas Hussain2010-05-014-129/+118
|\|
| * Tagging 0.6.2Matthew Wild2010-04-140-0/+0
| |
| * prosody.cfg.lua.dist: Refactor the default config file based on feedback ↵vault/0.6.20.6.2Matthew Wild2010-04-141-88/+82
| | | | | | | | from confused users
| * hostmanager: Re-word log messages in line with config changesMatthew Wild2010-04-141-3/+3
| |
| * configmanager: Add VirtualHost as an alias for HostMatthew Wild2010-04-141-3/+3
| |
| * MUC: Allow moderators which are not owners to change roles.Waqas Hussain2010-04-141-1/+1
| |
* | MUC: Include <status code='100'/> in a message, not in presence. Fixes ↵Waqas Hussain2010-04-191-3/+5
| | | | | | | | various issues.
* | modulemanager: Log proper tracebacks on errors during module load/unload.Waqas Hussain2010-04-191-1/+9
| |
* | prosody: Set metatable on functions to allow easy access to upvalues.Waqas Hussain2010-04-191-0/+24
| |
* | net.server_event: Call listener.onconnect if it exists, otherwise stick to ↵Matthew Wild2010-04-111-2/+2
| | | | | | | | listener.onincoming
* | net.server_select: Support for listener.onconnectMatthew Wild2010-04-111-1/+10
| |
* | Merge 0.6->0.7Matthew Wild2010-04-091-1/+1
|\|
| * net.server: Fix logic error causing traceback when receiving a non-number portMatthew Wild2010-04-091-1/+1
| |
* | util.timer: When using libevent hold onto the event handle to stop it being ↵Matthew Wild2010-04-071-2/+3
| | | | | | | | collected (and the timer stopping). Fixes BOSH ghosts, thanks Flo, niekie, waqas.
* | Merge 0.6->0.7Matthew Wild2010-04-033-5/+5
|\|
| * Merge 0.6/MattJ -> 0.6Matthew Wild2010-04-033-6/+8
| |\
| | * util.ztact: Fixed global accesses.Waqas Hussain2010-04-011-2/+2
| | |
| | * util.uuid: Use a local instead of a global.Waqas Hussain2010-04-011-1/+1
| | |
| | * util.stanza: Fixed some more nil global accesses.Waqas Hussain2010-04-011-3/+3
| | |
| | * util.stanza: Fixed a nil global access.Waqas Hussain2010-04-011-0/+2
| | |
| * | mod_bosh: Default stanza namespace should be jabber:client (fixes BOSH to ↵Matthew Wild2010-04-031-2/+2
| |/ | | | | | | work with recent namespace fix)
* | Merge 0.7/waqas->0.7/MattJMatthew Wild2010-03-301-4/+4
|\ \
| * | net.server_event: Fixed spelling fail.Waqas Hussain2010-03-261-4/+4
| | |
* | | Merge 0.6->0.7Matthew Wild2010-03-304-10/+10
|\ \ \ | |/ / |/| / | |/
| * xmppserver_listener: Compatibility fix for older Prosodies with the s2s ↵Matthew Wild2010-03-301-0/+3
| | | | | | | | xmlns bug
| * stanza_router, s2smanager, modulemanager: Fix for handling of the default ↵Matthew Wild2010-03-303-10/+7
| | | | | | | | namespace on stanzas, causing sometimes jabber:client to be sent over s2s, and accepted
* | tools/erlparse: Discard erlang PIDs instead of choking on them as a syntax errorMatthew Wild2010-03-251-0/+6
| |
* | tools/erlparse: Report the line number when showing a syntax error in the ↵Matthew Wild2010-03-251-2/+6
| | | | | | | | input file
* | tools/erlparse: Optimisations aplenty for faster processing of large filesMatthew Wild2010-03-251-28/+30
| |
* | tools/ejabberd2prosody: Create prosody singleton so datamanager can detect ↵Matthew Wild2010-03-251-0/+2
| | | | | | | | the platform (set no platform to use lfs, pposix isn't necessary here)
* | net.server_event: Don't re-try a write if the connection closed (thanks Flo)Matthew Wild2010-03-251-1/+1
| |
* | net.server_event: Bump timeout values up somewhatMatthew Wild2010-03-241-3/+3
| |