Software / code / prosody
Changeset
2736:27e8452cb426
Merge with 0.7
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 01 Mar 2010 21:03:17 +0000 |
| parents | 2730:dea5a65b321d (current diff) 2735:65bbc4b67733 (diff) |
| children | 2737:2251f8898900 2743:fd1d4d96a708 |
| files | |
| diffstat | 5 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/core/certmanager.lua Mon Mar 01 18:08:52 2010 +0000 +++ b/core/certmanager.lua Mon Mar 01 21:03:17 2010 +0000 @@ -54,7 +54,7 @@ end function reload_ssl_config() - default_ssl_config = config.get("*", "core", "ssl"); + default_ssl_config = configmanager.get("*", "core", "ssl"); end prosody.events.add_handler("config-reloaded", reload_ssl_config);
--- a/net/server_event.lua Mon Mar 01 18:08:52 2010 +0000 +++ b/net/server_event.lua Mon Mar 01 21:03:17 2010 +0000 @@ -543,7 +543,7 @@ local callback = function( ) interface:_close() interface.eventwritetimeout = nil - return evreturn, evtimeout + return -1; end interface.eventwritetimeout = addevent( base, nil, EV_TIMEOUT, callback, cfg.WRITE_TIMEOUT ) -- reg a new timeout event debug( "wantread during write attemp, reg it in readcallback but dont know what really happens next..." ) @@ -762,7 +762,7 @@ local server = function( ) return nil, "this is a dummy server interface" end - local interface = wrapclient( client, ip, serverport, listeners, pattern, sslctx, startssl ) + local interface = wrapclient( client, ip, serverport, listener, pattern, sslctx, startssl ) interface:_start_connection( startssl ) debug( "new connection id:", interface.id ) return interface, err
--- a/net/server_select.lua Mon Mar 01 18:08:52 2010 +0000 +++ b/net/server_select.lua Mon Mar 01 21:03:17 2010 +0000 @@ -472,7 +472,7 @@ _sendlistlen = removesocket( _sendlist, socket, _sendlistlen ) -- delete socket from writelist _ = needtls and handler:starttls(nil, true) _writetimes[ handler ] = nil - _ = toclose and handlerclose( ) + _ = toclose and handler:close( ) return true elseif byte and ( err == "timeout" or err == "wantwrite" ) then -- want write buffer = string_sub( buffer, byte + 1, bufferlen ) -- new buffer
--- a/util/sasl.lua Mon Mar 01 18:08:52 2010 +0000 +++ b/util/sasl.lua Mon Mar 01 21:03:17 2010 +0000 @@ -143,7 +143,7 @@ end -- load the mechanisms -load_mechs = {"plain", "digest-md5", "anonymous", "scram"} +local load_mechs = {"plain", "digest-md5", "anonymous", "scram"} for _, mech in ipairs(load_mechs) do local name = "util.sasl."..mech; local m = require(name);
--- a/util/stanza.lua Mon Mar 01 18:08:52 2010 +0000 +++ b/util/stanza.lua Mon Mar 01 21:03:17 2010 +0000 @@ -247,14 +247,14 @@ for i=1,#attr do attr[i] = nil; end local attrx = {}; for att in pairs(attr) do - if s_find(att, "|", 1, true) and not s_find(k, "\1", 1, true) then - local ns,na = s_match(k, "^([^|]+)|(.+)$"); + if s_find(att, "|", 1, true) and not s_find(att, "\1", 1, true) then + local ns,na = s_match(att, "^([^|]+)|(.+)$"); attrx[ns.."\1"..na] = attr[att]; attr[att] = nil; end end for a,v in pairs(attrx) do - attr[x] = v; + attr[a] = v; end setmetatable(stanza, stanza_mt); for _, child in ipairs(stanza) do
