aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Removed some legacy doc/ files.Waqas Hussain2009-11-252-36/+0
|
* Merge with 0.6Matthew Wild2009-11-252-1/+6
|\
| * util.dependencies: Log an error if the current version of LuaSec installed ↵Matthew Wild2009-11-251-0/+5
| | | | | | | | contains The Bug (thanks Remko)
| * Merge with 0.6 on prosody.imvault/0.6.00.6.0Matthew Wild2009-11-256-31/+76
| |\
| | * xmppclient_listener: Escape control characters when logging invalid XML.Waqas Hussain2009-11-241-1/+1
| | |
* | | Merge with 0.6Matthew Wild2009-11-251-0/+4
|\| |
| * | s2smanager: Log warning when trying to send a stanza from a host we don't ↵Matthew Wild2009-11-251-0/+4
| | | | | | | | | | | | serve, instead of a traceback (thanks stpeter)
* | | Merge with trunkMatthew Wild2009-11-241-2/+9
|\ \ \
| * | | net.server: Log an error when libevent is requested, but luaevent is ↵Waqas Hussain2009-11-241-2/+9
| | | | | | | | | | | | | | | | unavailable, and don't load luaevent when not requested.
* | | | 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 ↵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