aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | 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 ↵Matthew Wild2009-11-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | just-in-time creation until we have the new datamanager API
| * | | | | | 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 ↵Matthew Wild2009-11-231-0/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | the new modulemanager config option API
* | | | | | | modulemanager: New module API methods for getting config options with type ↵Matthew Wild2009-11-231-1/+82
|/ / / / / / | | | | | | | | | | | | | | | | | | conversion, get_option_string, get_option_number, get_option_boolean, get_option_array, get_option_set
* | | | | | util.dependencies: Make the commands line up properly in the "missing ↵Matthew Wild2009-11-231-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | dependency" output. Yes, this was the commit you didn't know you were waiting for!
* | | | | | 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 ↵Waqas Hussain2009-11-221-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | unsubscribe, subscribed and unsubscribed) to the user before roster pushes.
| * | | | | mod_presence: Acknowledge subscription requests by responding with an ↵Waqas Hussain2009-11-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | unavailable presence.
| * | | | | sessionmanager: Added function send_to_interested_resources().Waqas Hussain2009-11-221-0/+15
| | | | | |
| * | | | | sessionmanager: Fixed and cleaned function send_to_available_resources(). ↵Waqas Hussain2009-11-221-12/+7
| | | | | | | | | | | | | | | | | | | | | | | | The 'to' attribute for presence subscription stanzas is now preserved.
| * | | | | loggingmanager: Explicitly flush log messages if the __FLUSH_LOG environment ↵Waqas Hussain2009-11-221-0/+6
| |/ / / / | | | | | | | | | | | | | | | variable is defined (workaround for MSVCRT buffering piped output).
* | | | | 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 ↵Matthew Wild2009-11-221-1/+1
| | | | | | | | | | | | | | | | | | | | traceback (thanks Tobias)
* | | | | 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 -> ↵Matthew Wild2009-11-225-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | .onincoming, .disconnect -> .ondisconnect
* | | | | | 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 ↵Matthew Wild2009-11-221-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | libevent for other reasons)
* | | | | | net.server_event: Comment accidentally uncommented vdebug()Matthew Wild2009-11-221-1/+1
| | | | | |
* | | | | | net.server_event: Handle and ignore 'wantread' error from receive(), treat ↵Matthew Wild2009-11-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | as a timeout
* | | | | | 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 ↵Matthew Wild2009-11-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | selective commits
* | | | | | 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, ↵Matthew Wild2009-11-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | fixes trying to use original socket after SSL-wrapping
* | | | | | net.server_event: Set startsslcallback property to nil when we're done ↵Matthew Wild2009-11-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | handshaking, otherwise we keep trying to repeat the handshake
* | | | | | 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
| | | | | |
* | | | | | net.server_event: Use correct listener callbacksMatthew Wild2009-11-221-2/+2
| | | | | |
* | | | | | net.server_event: Small whitespace fixesMatthew Wild2009-11-221-1/+2
| | | | | |
* | | | | | net.server_event: Correct a few instances of .sslctx to ._sslctxMatthew Wild2009-11-221-2/+2
| | | | | |