Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | mod_bosh: Backout revision bc0a68cae236 (experimental bosh_auto_cork option) ↵ | Matthew Wild | 2012-07-28 | 1 | -2/+1 |
| | | | | as I don't believe it works | ||||
* | mod_admin_telnet: Import prosody.incoming_s2s | Matthew Wild | 2012-07-28 | 1 | -5/+6 |
| | |||||
* | mod_admin_telnet: Fix usage of incorrect variable | Matthew Wild | 2012-07-28 | 1 | -1/+1 |
| | |||||
* | mod_admin_telnet: Remove unused variable | Matthew Wild | 2012-07-28 | 1 | -1/+1 |
| | |||||
* | mod_admin_telnet: Import portmanager and s2smanager, as they are both used | Matthew Wild | 2012-07-28 | 1 | -0/+2 |
| | |||||
* | mod_admin_telnet: Fix broken indentation | Matthew Wild | 2012-07-28 | 1 | -14/+14 |
| | |||||
* | mod_admin_telnet: Use module:get_option() instead of configmanager directly | Matthew Wild | 2012-07-28 | 1 | -1/+1 |
| | |||||
* | Merge with Florob | Matthew Wild | 2012-07-28 | 28 | -295/+445 |
|\ | |||||
| * | mod_dialback: Ignore <db:verify/> with a 'type' attribute on incoming ↵ | Matthew Wild | 2012-07-27 | 1 | -0/+5 |
| | | | | | | | | connections, instead of interpreting them as a request to verify a key | ||||
| * | mod_vcard: Remove vcard_compatibility COMPAT (moved to mod_compat_vcard in ↵ | Matthew Wild | 2012-07-26 | 1 | -9/+4 |
| | | | | | | | | prosody-modules), and add warning for those using the option | ||||
| * | mod_muc: Remove unused variable and pull hosts into a local | Kim Alvefur | 2012-07-26 | 1 | -3/+3 |
| | | |||||
| * | mod_muc: Use module:send() instead of core_*_stanza() | Kim Alvefur | 2012-07-26 | 1 | -2/+2 |
| | | |||||
| * | mod_announce, mod_motd, mod_pubsub, mod_register, mod_watchregistrations, ↵ | Kim Alvefur | 2012-07-26 | 6 | -7/+7 |
| | | | | | | | | mod_welcome: Use module:send() instead of core_*_stanza() | ||||
| * | mod_admin_adhoc, mod_admin_telnet, mod_bosh, mod_c2s, mod_component, ↵ | Kim Alvefur | 2012-07-26 | 9 | -5/+10 |
| | | | | | | | | mod_pep, mod_presence, mod_roster, mod_s2s: Import core_post_stanza from the global prosody table. | ||||
| * | mod_admin_telnet: Add xmpp:ping(from, to), useful for initiating s2s connections | Kim Alvefur | 2012-07-26 | 1 | -0/+14 |
| | | |||||
| * | Merge with Zash | Matthew Wild | 2012-07-25 | 1 | -4/+3 |
| |\ | |||||
| | * | mod_admin_telnet: Remove useless call to string.lower() | Kim Alvefur | 2012-07-24 | 1 | -2/+1 |
| | | | |||||
| | * | mod_admin_telnet: Add missing import of usermanager | Kim Alvefur | 2012-07-24 | 1 | -0/+2 |
| | | | |||||
| | * | mod_admin_telnet: Remove unused or duplicated locals | Kim Alvefur | 2012-07-24 | 1 | -2/+0 |
| | | | |||||
| * | | mod_pep: Allow configurable service discovery identity (Fix) | IRON | 2012-07-25 | 1 | -1/+1 |
| | | | |||||
| * | | mod_pep: Allow configurable service discovery identity | IRON | 2012-07-25 | 1 | -1/+1 |
| |/ | |||||
| * | mod_auth_cyrus, util.sasl_cyrus: Add new option 'cyrus_server_fqdn' to ↵ | Matthew Wild | 2012-07-24 | 1 | -1/+3 |
| | | | | | | | | override the hostname passed to Cyrus (and used in e.g. GSSAPI/Kerberos) - fixes #295 | ||||
| * | mod_muc: Fix a couple of cases of 'forbidden' stanza error being sent with ↵ | Matthew Wild | 2012-07-24 | 1 | -2/+2 |
| | | | | | | | | type 'cancel' - fixes #303 | ||||
| * | mod_bosh: Use new format for headers when checking for proxies to get the ↵ | Kim Alvefur | 2012-07-23 | 1 | -1/+1 |
| | | | | | | | | originating IP | ||||
| * | mod_s2s: Bump s2s_timeout to 90, to allow for the TCP timeout (in most ↵ | Matthew Wild | 2012-07-23 | 1 | -1/+1 |
| | | | | | | | | cases) - this allows us to continue to try other targets | ||||
| * | mod_c2s, mod_s2s: Lower 'Disconnecting X' log messages from 'info' to 'debug' | Matthew Wild | 2012-07-23 | 2 | -6/+6 |
| | | |||||
| * | Hopefully inert commit to clean up logging across a number of modules, ↵ | Matthew Wild | 2012-07-23 | 7 | -21/+19 |
| | | | | | | | | removing all cases of concatenation when building log messages | ||||
| * | mod_admin_telnet: Always handle commands terminated by line feeds - ensures ↵ | Matthew Wild | 2012-07-23 | 1 | -55/+63 |
| | | | | | | | | consistency even when packets are joined or split on the network | ||||
| * | mod_s2s: Adjust session:close() in line with mod_c2s's - fixes waiting for ↵ | Matthew Wild | 2012-07-23 | 1 | -6/+6 |
| | | | | | | | | </stream:stream> if it has already been sent by the peer | ||||
| * | mod_s2s/s2sout.lib: Use %s to insert strings into log messages instead of ↵ | Matthew Wild | 2012-07-23 | 1 | -3/+3 |
| | | | | | | | | concatenation | ||||
| * | mod_c2s: Change 'reason' parameter of session:close() to take nil to mean ↵ | Matthew Wild | 2012-07-23 | 1 | -6/+6 |
| | | | | | | | | 'graceful close initiated by us' and false for 'graceful close initiated by client' | ||||
| * | mod_disco: Allow configurable name in disco identity (defaults to 'Prosody') | Matthew Wild | 2012-07-23 | 1 | -1/+1 |
| | | |||||
| * | Merge with Maranda | Matthew Wild | 2012-07-22 | 1 | -0/+35 |
| |\ | |||||
| | * | mod_admin_telnet: add s2s:closeall command and relative help entry. | Marco Cirillo | 2012-07-09 | 1 | -0/+35 |
| | | | |||||
| * | | Merge with Zash | Matthew Wild | 2012-07-22 | 2 | -1/+38 |
| |\ \ | |||||
| | * | | adhoc.lib: Make some globals local | Kim Alvefur | 2012-07-18 | 1 | -1/+2 |
| | | | | |||||
| | * | | mod_admin_telnet: Add info about user management commands to the help | Kim Alvefur | 2012-07-09 | 1 | -0/+5 |
| | | | | |||||
| | * | | mod_admin_telnet: Add some user management commands. | Kim Alvefur | 2012-07-09 | 1 | -0/+31 |
| | | | | |||||
| * | | | mod_admin_telnet: Replace anonymous function with loop (saves a closure) | Matthew Wild | 2012-07-22 | 1 | -11/+11 |
| | | | | |||||
| * | | | Merge 0.9->trunk | Matthew Wild | 2012-07-22 | 6 | -103/+131 |
| |\ \ \ | |||||
| | * | | | mod_s2s: Don't call ondisconnect manually, don't call conn:close() 3 times ↵ | Matthew Wild | 2012-07-22 | 1 | -19/+29 |
| | | | | | | | | | | | | | | | | | | | | (!) and merge its logic and streamdisconnected into session_close - including now waiting for a reply </stream:stream> if there is the chance of further stanzas requiring delivery arriving. session.sends2s() on a half-closed stream returns false. | ||||
| | * | | | mod_s2s: Don't treat a stanza as delivered if session.sends2s() returns false | Matthew Wild | 2012-07-22 | 1 | -3/+4 |
| | | | | | |||||
| | * | | | mod_presence: Handle nil disconnection error | Matthew Wild | 2012-07-22 | 1 | -4/+6 |
| | | | | | |||||
| | * | | | mod_iq: Don't treat an iq as handled if session.send() returns false | Matthew Wild | 2012-07-22 | 1 | -4/+1 |
| | | | | | |||||
| | * | | | mod_message: Don't treat a message as delivered ok if session.send() returns ↵ | Matthew Wild | 2012-07-22 | 1 | -5/+6 |
| | | | | | | | | | | | | | | | | | | | | false | ||||
| | * | | | mod_c2s: Don't call ondisconnect manually on close, it is now called by ↵ | Matthew Wild | 2012-07-22 | 1 | -4/+23 |
| | | | | | | | | | | | | | | | | | | | | net.server. Replace with inline code for destroying the session, and also waiting for a reply </stream:stream> if there is a chance of further data sent by the client. session.send() on a half-closed stream returns false (and does not deliver the data). | ||||
| | * | | | mod_s2s: Make unauthed session timeout a little more aggressive... otherwise ↵ | Matthew Wild | 2012-07-22 | 1 | -4/+2 |
| | | | | | | | | | | | | | | | | | | | | it's possible for sessions to slip under the net and never get killed off | ||||
| | * | | | mod_s2s/s2sout.lib: Fix indentation | Matthew Wild | 2012-07-22 | 1 | -60/+60 |
| | | | | | |||||
| * | | | | Merge 0.9->trunk | Matthew Wild | 2012-07-22 | 1 | -8/+7 |
| |\| | | | |||||
| | * | | | mod_s2s/s2sout.lib: Don't wait for both v4 and v6 DNS responses if we only ↵ | Matthew Wild | 2012-07-22 | 1 | -8/+7 |
| | | | | | | | | | | | | | | | | | | | | send one (e.g. because v6 is disabled) |