Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | 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 | |
| | | | | | | ||||||
* | | | | | | net.server_event: Use correct listener callbacks | Matthew Wild | 2009-11-22 | 1 | -2/+2 | |
| | | | | | | ||||||
* | | | | | | net.server_event: Small whitespace fixes | Matthew Wild | 2009-11-22 | 1 | -1/+2 | |
| | | | | | | ||||||
* | | | | | | net.server_event: Correct a few instances of .sslctx to ._sslctx | Matthew Wild | 2009-11-22 | 1 | -2/+2 | |
| | | | | | | ||||||
* | | | | | | net.server_event: Call connection's onconnect, no need to pass closures ↵ | Matthew Wild | 2009-11-22 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | around now | |||||
* | | | | | | net.server_event: Use connection id in all relevant logging | Matthew Wild | 2009-11-22 | 1 | -11/+11 | |
| | | | | | | ||||||
* | | | | | | net.server_event: Define id property for connection objects, to aid logging | Matthew Wild | 2009-11-22 | 1 | -0/+2 | |
| | | | | | | ||||||
* | | | | | | net.server_event: Define vdebug function for convenience | Matthew Wild | 2009-11-22 | 1 | -0/+1 | |
| | | | | | | ||||||
* | | | | | | net.server_event: Change to new standard addserver() syntax | Matthew Wild | 2009-11-21 | 1 | -2/+2 | |
| | | | | | | ||||||
* | | | | | | net.server_select: Change addserver() parameters to be compatible with new ↵ | Matthew Wild | 2009-11-21 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | standard syntax | |||||
* | | | | | | mod_tls: Switch to : syntax for connection methods | Matthew Wild | 2009-11-21 | 1 | -5/+5 | |
| | | | | | | ||||||
* | | | | | | xmppclient_listener: Use : syntax for connection methods, to be compatible ↵ | Matthew Wild | 2009-11-21 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | with new server.lua | |||||
* | | | | | | xmppclient_listener: Switch to .onincoming listener method, to be compatible ↵ | Matthew Wild | 2009-11-21 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | with new server_event.lua | |||||
* | | | | | | net.server: Small fix for addtimer() compatibility code | Matthew Wild | 2009-11-21 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | net.connlisteners: Standardise on new syntax for addserver(), and clean up a bit | Matthew Wild | 2009-11-21 | 1 | -3/+8 | |
| | | | | | | ||||||
* | | | | | | sessionmanager: Use : syntax for calling connection methods | Matthew Wild | 2009-11-21 | 1 | -2/+2 | |
|/ / / / / | ||||||
* | | | | | mod_bosh: Don't log response XML | Matthew Wild | 2009-11-21 | 1 | -2/+2 | |
| | | | | | ||||||
* | | | | | util.timer: Fix libevent timers (event.base doesn't exist...) | Matthew Wild | 2009-11-21 | 1 | -1/+2 | |
| | | | | | ||||||
* | | | | | net.server_event: Export base as event_base | Matthew Wild | 2009-11-21 | 1 | -0/+1 | |
| | | | | | ||||||
* | | | | | net.server_event: Comment overly verbose log message | Matthew Wild | 2009-11-21 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | util.timer: Use libevent for lightweight timers if available and configured ↵ | Matthew Wild | 2009-11-21 | 1 | -24/+44 | |
| | | | | | | | | | | | | | | | | | | | | (use_libevent option) | |||||
* | | | | | net.server: New net.server to choose the appropriate library from ↵ | Matthew Wild | 2009-11-21 | 1 | -0/+21 | |
| | | | | | | | | | | | | | | | | | | | | server_select/server_event based on the availability of luaevent and the use_libevent config option | |||||
* | | | | | net.server: Rename to net.server_select | Matthew Wild | 2009-11-21 | 1 | -0/+0 | |
| | | | | | ||||||
* | | | | | net.server_event: Remove redundant getid() function | Matthew Wild | 2009-11-20 | 1 | -5/+0 | |
| | | | | | ||||||
* | | | | | net.server_event: Initial commit of server_event.lua. Don't get too excited, ↵ | Matthew Wild | 2009-11-20 | 1 | -0/+759 | |
|/ / / / | | | | | | | | | | | | | it's not used at all yet, and is still incomplete :) | |||||
* | | | | s2smanager: Fail outgoing s2s connection if hostname does not pass ↵ | Matthew Wild | 2009-11-20 | 1 | -1/+6 | |
| | | | | | | | | | | | | | | | | idna_to_ascii(), thanks Flo + waqas | |||||
* | | | | s2smanager: Queue db:verify unless we already sent a db:result (if we had ↵ | Matthew Wild | 2009-11-20 | 1 | -5/+1 | |
| |_|/ |/| | | | | | | | | then it can could a dialback deadlock). Also remove some redundant code which could cause a db:result to be sent while still negotiating features (e.g. TLS) and break things. Collectively these fix a 'random' s2s failure (usually with ejabberd for some reason) - resulting in an 'unbound prefix' XML error, or 'ssl handshake failure'. Was this commit message long enough? I think so. | |||||
* | | | util.sasl: Add COMPAT comment | Matthew Wild | 2009-11-18 | 1 | -0/+1 | |
| | | | ||||||
* | | | mod_console: Moved activation of the console port from the main file to ↵ | Waqas Hussain | 2009-11-18 | 2 | -1/+2 | |
| | | | | | | | | | | | | mod_console. | |||||
* | | | prosody.net_activate_ports: Slightly refactored and definition moved to ↵ | Waqas Hussain | 2009-11-18 | 1 | -35/+36 | |
| | | | | | | | | | | | | before modules are loaded. | |||||
* | | | mod_register: Log a debug message when a session's IP is not available. | Waqas Hussain | 2009-11-18 | 1 | -1/+3 | |
| | | | ||||||
* | | | mod_bosh: Set session.ip for BOSH sessions. | Waqas Hussain | 2009-11-18 | 1 | -0/+1 | |
| | | |