aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
Commit message (Collapse)AuthorAgeFilesLines
* mod_admin_adhoc, mod_admin_telnet, mod_bosh, mod_c2s, mod_component, ↵Kim Alvefur2012-07-269-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 connectionsKim Alvefur2012-07-261-0/+14
|
* Merge with ZashMatthew Wild2012-07-251-4/+3
|\
| * mod_admin_telnet: Remove useless call to string.lower()Kim Alvefur2012-07-241-2/+1
| |
| * mod_admin_telnet: Add missing import of usermanagerKim Alvefur2012-07-241-0/+2
| |
| * mod_admin_telnet: Remove unused or duplicated localsKim Alvefur2012-07-241-2/+0
| |
* | mod_pep: Allow configurable service discovery identity (Fix)IRON2012-07-251-1/+1
| |
* | mod_pep: Allow configurable service discovery identityIRON2012-07-251-1/+1
|/
* mod_auth_cyrus, util.sasl_cyrus: Add new option 'cyrus_server_fqdn' to ↵Matthew Wild2012-07-241-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 Wild2012-07-241-2/+2
| | | | type 'cancel' - fixes #303
* mod_bosh: Use new format for headers when checking for proxies to get the ↵Kim Alvefur2012-07-231-1/+1
| | | | originating IP
* mod_s2s: Bump s2s_timeout to 90, to allow for the TCP timeout (in most ↵Matthew Wild2012-07-231-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 Wild2012-07-232-6/+6
|
* Hopefully inert commit to clean up logging across a number of modules, ↵Matthew Wild2012-07-237-21/+19
| | | | removing all cases of concatenation when building log messages
* mod_admin_telnet: Always handle commands terminated by line feeds - ensures ↵Matthew Wild2012-07-231-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 Wild2012-07-231-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 Wild2012-07-231-3/+3
| | | | concatenation
* mod_c2s: Change 'reason' parameter of session:close() to take nil to mean ↵Matthew Wild2012-07-231-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 Wild2012-07-231-1/+1
|
* Merge with MarandaMatthew Wild2012-07-221-0/+35
|\
| * mod_admin_telnet: add s2s:closeall command and relative help entry.Marco Cirillo2012-07-091-0/+35
| |
* | Merge with ZashMatthew Wild2012-07-222-1/+38
|\ \
| * | adhoc.lib: Make some globals localKim Alvefur2012-07-181-1/+2
| | |
| * | mod_admin_telnet: Add info about user management commands to the helpKim Alvefur2012-07-091-0/+5
| | |
| * | mod_admin_telnet: Add some user management commands.Kim Alvefur2012-07-091-0/+31
| | |
* | | mod_admin_telnet: Replace anonymous function with loop (saves a closure)Matthew Wild2012-07-221-11/+11
| | |
* | | Merge 0.9->trunkMatthew Wild2012-07-226-103/+131
|\ \ \
| * | | mod_s2s: Don't call ondisconnect manually, don't call conn:close() 3 times ↵Matthew Wild2012-07-221-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 falseMatthew Wild2012-07-221-3/+4
| | | |
| * | | mod_presence: Handle nil disconnection errorMatthew Wild2012-07-221-4/+6
| | | |
| * | | mod_iq: Don't treat an iq as handled if session.send() returns falseMatthew Wild2012-07-221-4/+1
| | | |
| * | | mod_message: Don't treat a message as delivered ok if session.send() returns ↵Matthew Wild2012-07-221-5/+6
| | | | | | | | | | | | | | | | false
| * | | mod_c2s: Don't call ondisconnect manually on close, it is now called by ↵Matthew Wild2012-07-221-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 Wild2012-07-221-4/+2
| | | | | | | | | | | | | | | | it's possible for sessions to slip under the net and never get killed off
| * | | mod_s2s/s2sout.lib: Fix indentationMatthew Wild2012-07-221-60/+60
| | | |
* | | | Merge 0.9->trunkMatthew Wild2012-07-221-8/+7
|\| | |
| * | | mod_s2s/s2sout.lib: Don't wait for both v4 and v6 DNS responses if we only ↵Matthew Wild2012-07-221-8/+7
| | | | | | | | | | | | | | | | send one (e.g. because v6 is disabled)
* | | | Merge 0.9->trunkMatthew Wild2012-07-191-1/+0
|\| | | | |_|/ |/| |
| * | mod_admin_adhoc: Remove unused variable and save a bit of CPU...Matthew Wild2012-07-191-1/+0
| |/
* | Merge 0.9->trunkMatthew Wild2012-07-082-35/+51
|\ \ | |/ |/|
| * Merge 0.9->trunkMatthew Wild2012-07-071-1/+2
| |\
| * \ Merge 0.9->trunkMatthew Wild2012-07-051-2/+2
| |\ \
| * | | mod_admin_web: Use util.dataforms' own error checkingFlorian Zeitz2012-07-051-34/+50
| | | |
| * | | mod_dialback: Skip an unnecessary nameprep.Waqas Hussain2012-06-151-1/+1
| | | |
* | | | Backed out changeset 72a2eec4204a (incomplete fix)Matthew Wild2012-07-081-2/+1
| |_|/ |/| |
* | | mod_auth_anonymous: Attach a fake roster to the session, so the null storage ↵Kim Alvefur2012-07-071-1/+2
| | | | | | | | | | | | backend can be used
* | | Merge (some of) trunk -> 0.9Matthew Wild2012-07-051-10/+18
|\| | | |/ |/|
| * Merge with trunkMatthew Wild2012-06-123-15/+16
| |\
| * | MUC: Handle missing persistent room data.Waqas Hussain2012-06-121-10/+18
| | |
* | | mod_saslauth: Pass session to usermanager.get_sasl_handler()Matthew Wild2012-07-041-2/+2
| |/ |/|