aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-03-30 19:48:04 +0100
committerMatthew Wild <mwild1@gmail.com>2010-03-30 19:48:04 +0100
commitaf3bc714626c4e7b5299ef675bb244e963c1cfaa (patch)
tree05a514961ba273cda5c75bca8aa60fc278c6befc /net
parent3d22f29cfab86c8a1ae34400df258a3e9b47d9ac (diff)
parent3dbf4c9e57cec2baa98f8864263a3cd11d608707 (diff)
downloadprosody-af3bc714626c4e7b5299ef675bb244e963c1cfaa.tar.gz
prosody-af3bc714626c4e7b5299ef675bb244e963c1cfaa.zip
Merge 0.7->trunk
Diffstat (limited to 'net')
-rw-r--r--net/server_event.lua8
-rw-r--r--net/xmppserver_listener.lua3
2 files changed, 7 insertions, 4 deletions
diff --git a/net/server_event.lua b/net/server_event.lua
index af6da45e..5e62f3fd 100644
--- a/net/server_event.lua
+++ b/net/server_event.lua
@@ -20,14 +20,14 @@ local LAST_MODIFIED = "2009/11/20"
local cfg = {
MAX_CONNECTIONS = 100000, -- max per server connections (use "ulimit -n" on *nix)
- MAX_HANDSHAKE_ATTEMPS = 1000, -- attemps to finish ssl handshake
- HANDSHAKE_TIMEOUT = 60, -- timout in seconds per handshake attemp
+ MAX_HANDSHAKE_ATTEMPS = 1000, -- attempts to finish ssl handshake
+ HANDSHAKE_TIMEOUT = 60, -- timout in seconds per handshake attempt
MAX_READ_LENGTH = 1024 * 1024 * 1024 * 1024, -- max bytes allowed to read from sockets
MAX_SEND_LENGTH = 1024 * 1024 * 1024 * 1024, -- max bytes size of write buffer (for writing on sockets)
- ACCEPT_DELAY = 10, -- seconds to wait until the next attemp of a full server to accept
+ ACCEPT_DELAY = 10, -- seconds to wait until the next attempt of a full server to accept
READ_TIMEOUT = 60 * 60 * 6, -- timeout in seconds for read data from socket
WRITE_TIMEOUT = 180, -- timeout in seconds for write data on socket
- CONNECT_TIMEOUT = 20, -- timeout in seconds for connection attemps
+ CONNECT_TIMEOUT = 20, -- timeout in seconds for connection attempts
CLEAR_DELAY = 5, -- seconds to wait for clearing interface list (and calling ondisconnect listeners)
DEBUG = true, -- show debug messages
}
diff --git a/net/xmppserver_listener.lua b/net/xmppserver_listener.lua
index d63f5c23..d1272edb 100644
--- a/net/xmppserver_listener.lua
+++ b/net/xmppserver_listener.lua
@@ -50,6 +50,9 @@ end
local function handleerr(err) log("error", "Traceback[s2s]: %s: %s", tostring(err), debug.traceback()); end
function stream_callbacks.handlestanza(a, b)
+ if b.attr.xmlns == "jabber:client" then --COMPAT: Prosody pre-0.6.2 may send jabber:client
+ b.attr.xmlns = nil;
+ end
xpcall(function () core_process_stanza(a, b) end, handleerr);
end