Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge with trunk | Matthew Wild | 2009-11-24 | 1 | -2/+9 |
|\ | |||||
| * | net.server: Log an error when libevent is requested, but luaevent is ↵ | Waqas Hussain | 2009-11-24 | 1 | -2/+9 |
| | | | | | | | | unavailable, and don't load luaevent when not requested. | ||||
* | | core.sessionmanager, net.*_listener: Remove the evil collectgarbage() calls | Matthew Wild | 2009-11-24 | 4 | -4/+0 |
|/ | |||||
* | Merge with trunk | Matthew Wild | 2009-11-23 | 1 | -1/+21 |
|\ | |||||
| * | Merged with 0.6. | Waqas Hussain | 2009-11-23 | 1 | -1/+21 |
| |\ | |||||
| | * | prosody: Added support for command line argument '--config'. | Waqas Hussain | 2009-11-23 | 1 | -1/+21 |
| | | | |||||
* | | | Merge with 0.6 | Matthew Wild | 2009-11-23 | 2 | -5/+27 |
|\ \ \ | |/ / |/| | | |||||
| * | | util.datamanager: Replace popen(mkdir) with lfs.mkdir, keeping the ↵ | Matthew Wild | 2009-11-23 | 1 | -2/+2 |
| | | | | | | | | | | | | just-in-time creation until we have the new datamanager API | ||||
| * | | util.dependencies: Missed a Debian/ | Matthew Wild | 2009-11-23 | 1 | -1/+1 |
| | | | |||||
| * | | util.dependencies: Clearer message, add homepages, etc. | Matthew Wild | 2009-11-23 | 1 | -7/+20 |
| | | | |||||
| * | | util.dependencies: Add LuaFileSystem as a hard dependency | Matthew Wild | 2009-11-23 | 1 | -0/+9 |
| | | | |||||
* | | | Merge with trunk | Matthew Wild | 2009-11-23 | 2 | -17/+22 |
|\ \ \ | |||||
| * \ \ | Merged with 0.6. | Waqas Hussain | 2009-11-23 | 2 | -17/+22 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | util.serialization: Replaced commas with semi-colons between table fields. | Waqas Hussain | 2009-11-23 | 1 | -1/+1 |
| | | | | |||||
| | * | | util.serialization: Concise output for empty tables. | Waqas Hussain | 2009-11-23 | 1 | -13/+18 |
| | | | | |||||
| | * | | Mainfile: Fixed some comments. | Waqas Hussain | 2009-11-23 | 1 | -4/+4 |
| | | | | |||||
* | | | | tests/modulemanager_option_conversion.lua: Add standalone test script for ↵ | Matthew Wild | 2009-11-23 | 1 | -0/+55 |
| | | | | | | | | | | | | | | | | the new modulemanager config option API | ||||
* | | | | modulemanager: New module API methods for getting config options with type ↵ | Matthew Wild | 2009-11-23 | 1 | -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 Wild | 2009-11-23 | 1 | -2/+6 |
| | | | | | | | | | | | | dependency" output. Yes, this was the commit you didn't know you were waiting for! | ||||
* | | | mod_console: Update for new net.server API | Matthew Wild | 2009-11-22 | 1 | -3/+3 |
| | | | |||||
* | | | Merged with 0.6. | Waqas Hussain | 2009-11-22 | 3 | -12/+32 |
|\| | | |||||
| * | | mod_presence: Route incoming presence subscription stanzas (types ↵ | Waqas Hussain | 2009-11-22 | 1 | -0/+3 |
| | | | | | | | | | | | | unsubscribe, subscribed and unsubscribed) to the user before roster pushes. | ||||
| * | | mod_presence: Acknowledge subscription requests by responding with an ↵ | Waqas Hussain | 2009-11-22 | 1 | -0/+1 |
| | | | | | | | | | | | | unavailable presence. | ||||
| * | | sessionmanager: Added function send_to_interested_resources(). | Waqas Hussain | 2009-11-22 | 1 | -0/+15 |
| | | | |||||
| * | | sessionmanager: Fixed and cleaned function send_to_available_resources(). ↵ | Waqas Hussain | 2009-11-22 | 1 | -12/+7 |
| | | | | | | | | | | | | The 'to' attribute for presence subscription stanzas is now preserved. | ||||
| * | | loggingmanager: Explicitly flush log messages if the __FLUSH_LOG environment ↵ | Waqas Hussain | 2009-11-22 | 1 | -0/+6 |
| |/ | | | | | | | variable is defined (workaround for MSVCRT buffering piped output). | ||||
* | | mod_proxy65: Update for new net.server API, untested | Matthew Wild | 2009-11-22 | 1 | -3/+3 |
| | | |||||
* | | mod_proxy65: Import from prosody-modules, thanks Ephraim :) | Matthew Wild | 2009-11-22 | 1 | -0/+268 |
| | | |||||
* | | net.server: Add some comments to explain to waqas how it all works :) | Matthew Wild | 2009-11-22 | 1 | -1/+6 |
| | | |||||
* | | xmppcomponent_listener: Use new API for writing to components, fixes ↵ | Matthew Wild | 2009-11-22 | 1 | -1/+1 |
| | | | | | | | | traceback (thanks Tobias) | ||||
* | | s2smanager: Fix syntax error introduced in merge | Matthew Wild | 2009-11-22 | 1 | -1/+1 |
| | | |||||
* | | Merge with trunk | Matthew Wild | 2009-11-22 | 3 | -63/+63 |
|\ \ | |||||
| * | | stanza_router: Don't log full stanzas destined for s2s | Matthew Wild | 2009-11-22 | 1 | -1/+1 |
| | | | |||||
| * | | objectmanager: Convert to unix line-endings | Matthew Wild | 2009-11-21 | 1 | -60/+60 |
| | | | |||||
| * | | s2smanager: Don't log full stanza when sending outwards | Matthew Wild | 2009-11-21 | 1 | -2/+2 |
| | | | |||||
| * | | s2smanager: Don't tostring() the data before sending, sends2s already does this. | Matthew Wild | 2009-11-21 | 1 | -1/+1 |
| | | | |||||
* | | | net.server_select: Bring up to date to new common connection API | Matthew Wild | 2009-11-22 | 1 | -24/+24 |
| | | | |||||
* | | | net.httpserver, net.http: Update for new net.server API (untested) | Matthew Wild | 2009-11-22 | 2 | -4/+4 |
| | | | |||||
* | | | *_listener: Update for new net.server API, specifically .listener -> ↵ | Matthew Wild | 2009-11-22 | 5 | -12/+12 |
| | | | | | | | | | | | | .onincoming, .disconnect -> .ondisconnect | ||||
* | | | net.adns: Update for new net.server API (doesn't work with libevent yet) | Matthew Wild | 2009-11-22 | 1 | -3/+3 |
| | | | |||||
* | | | s2smanager: Update for new net.server API (s2s still doesn't work with ↵ | Matthew Wild | 2009-11-22 | 1 | -3/+3 |
| | | | | | | | | | | | | libevent for other reasons) | ||||
* | | | net.server_event: Comment accidentally uncommented vdebug() | Matthew Wild | 2009-11-22 | 1 | -1/+1 |
| | | | |||||
* | | | net.server_event: Handle and ignore 'wantread' error from receive(), treat ↵ | Matthew Wild | 2009-11-22 | 1 | -1/+1 |
| | | | | | | | | | | | | as a timeout | ||||
* | | | net.server_event: Remove premature non-optimisation | Matthew Wild | 2009-11-22 | 1 | -2/+2 |
| | | | |||||
* | | | net.server_event: Fix moved line caused by Mercurial's crecord and my ↵ | Matthew Wild | 2009-11-22 | 1 | -1/+1 |
| | | | | | | | | | | | | selective commits | ||||
* | | | net.server_event: Obey nowriting/nointerface for locks in interface methods | Matthew Wild | 2009-11-22 | 1 | -0/+2 |
| | | | |||||
* | | | net.server_event: Use conn property for send/receive instead of caching, ↵ | Matthew Wild | 2009-11-22 | 1 | -2/+2 |
| | | | | | | | | | | | | fixes trying to use original socket after SSL-wrapping | ||||
* | | | net.server_event: Set startsslcallback property to nil when we're done ↵ | Matthew Wild | 2009-11-22 | 1 | -0/+1 |
| | | | | | | | | | | | | handshaking, otherwise we keep trying to repeat the handshake | ||||
* | | | net.server_event: Add set_sslctx() method to connections | Matthew Wild | 2009-11-22 | 1 | -1/+3 |
| | | | |||||
* | | | net.server_event: conn.usingssl -> conn._usingssl | Matthew Wild | 2009-11-22 | 1 | -4/+4 |
| | | |