aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge with trunkMatthew Wild2009-11-241-2/+9
|\
| * net.server: Log an error when libevent is requested, but luaevent is unavaila...Waqas Hussain2009-11-241-2/+9
* | core.sessionmanager, net.*_listener: Remove the evil collectgarbage() callsMatthew Wild2009-11-244-4/+0
|/
* Merge with trunkMatthew Wild2009-11-231-1/+21
|\
| * Merged with 0.6.Waqas Hussain2009-11-231-1/+21
| |\
| | * prosody: Added support for command line argument '--config'.Waqas Hussain2009-11-231-1/+21
* | | Merge with 0.6Matthew Wild2009-11-232-5/+27
|\ \ \ | |/ / |/| |
| * | util.datamanager: Replace popen(mkdir) with lfs.mkdir, keeping the just-in-ti...Matthew Wild2009-11-231-2/+2
| * | util.dependencies: Missed a Debian/Matthew Wild2009-11-231-1/+1
| * | util.dependencies: Clearer message, add homepages, etc.Matthew Wild2009-11-231-7/+20
| * | util.dependencies: Add LuaFileSystem as a hard dependencyMatthew Wild2009-11-231-0/+9
* | | Merge with trunkMatthew Wild2009-11-232-17/+22
|\ \ \
| * \ \ Merged with 0.6.Waqas Hussain2009-11-232-17/+22
| |\ \ \ | | | |/ | | |/|
| | * | util.serialization: Replaced commas with semi-colons between table fields.Waqas Hussain2009-11-231-1/+1
| | * | util.serialization: Concise output for empty tables.Waqas Hussain2009-11-231-13/+18
| | * | Mainfile: Fixed some comments.Waqas Hussain2009-11-231-4/+4
* | | | tests/modulemanager_option_conversion.lua: Add standalone test script for the...Matthew Wild2009-11-231-0/+55
* | | | modulemanager: New module API methods for getting config options with type co...Matthew Wild2009-11-231-1/+82
|/ / /
* | | util.dependencies: Make the commands line up properly in the "missing depende...Matthew Wild2009-11-231-2/+6
* | | mod_console: Update for new net.server APIMatthew Wild2009-11-221-3/+3
* | | Merged with 0.6.Waqas Hussain2009-11-223-12/+32
|\| |
| * | mod_presence: Route incoming presence subscription stanzas (types unsubscribe...Waqas Hussain2009-11-221-0/+3
| * | mod_presence: Acknowledge subscription requests by responding with an unavail...Waqas Hussain2009-11-221-0/+1
| * | sessionmanager: Added function send_to_interested_resources().Waqas Hussain2009-11-221-0/+15
| * | sessionmanager: Fixed and cleaned function send_to_available_resources(). The...Waqas Hussain2009-11-221-12/+7
| * | loggingmanager: Explicitly flush log messages if the __FLUSH_LOG environment ...Waqas Hussain2009-11-221-0/+6
| |/
* | mod_proxy65: Update for new net.server API, untestedMatthew Wild2009-11-221-3/+3
* | mod_proxy65: Import from prosody-modules, thanks Ephraim :)Matthew Wild2009-11-221-0/+268
* | net.server: Add some comments to explain to waqas how it all works :)Matthew Wild2009-11-221-1/+6
* | xmppcomponent_listener: Use new API for writing to components, fixes tracebac...Matthew Wild2009-11-221-1/+1
* | s2smanager: Fix syntax error introduced in mergeMatthew Wild2009-11-221-1/+1
* | Merge with trunkMatthew Wild2009-11-223-63/+63
|\ \
| * | stanza_router: Don't log full stanzas destined for s2sMatthew Wild2009-11-221-1/+1
| * | objectmanager: Convert to unix line-endingsMatthew Wild2009-11-211-60/+60
| * | s2smanager: Don't log full stanza when sending outwardsMatthew Wild2009-11-211-2/+2
| * | s2smanager: Don't tostring() the data before sending, sends2s already does this.Matthew Wild2009-11-211-1/+1
* | | net.server_select: Bring up to date to new common connection APIMatthew Wild2009-11-221-24/+24
* | | net.httpserver, net.http: Update for new net.server API (untested)Matthew Wild2009-11-222-4/+4
* | | *_listener: Update for new net.server API, specifically .listener -> .onincom...Matthew Wild2009-11-225-12/+12
* | | net.adns: Update for new net.server API (doesn't work with libevent yet)Matthew Wild2009-11-221-3/+3
* | | s2smanager: Update for new net.server API (s2s still doesn't work with libeve...Matthew Wild2009-11-221-3/+3
* | | net.server_event: Comment accidentally uncommented vdebug()Matthew Wild2009-11-221-1/+1
* | | net.server_event: Handle and ignore 'wantread' error from receive(), treat as...Matthew Wild2009-11-221-1/+1
* | | net.server_event: Remove premature non-optimisationMatthew Wild2009-11-221-2/+2
* | | net.server_event: Fix moved line caused by Mercurial's crecord and my selecti...Matthew Wild2009-11-221-1/+1
* | | net.server_event: Obey nowriting/nointerface for locks in interface methodsMatthew Wild2009-11-221-0/+2
* | | net.server_event: Use conn property for send/receive instead of caching, fixe...Matthew Wild2009-11-221-2/+2
* | | net.server_event: Set startsslcallback property to nil when we're done handsh...Matthew Wild2009-11-221-0/+1
* | | net.server_event: Add set_sslctx() method to connectionsMatthew Wild2009-11-221-1/+3
* | | net.server_event: conn.usingssl -> conn._usingsslMatthew Wild2009-11-221-4/+4