Software / code / prosody
Changeset
4114:103da0201867
Merge 0.8->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 11 Jan 2011 05:31:29 +0000 |
| parents | 4110:8792da53e503 (current diff) 4113:65482a852c4d (diff) |
| children | 4116:7ffc6828a6d6 |
| files | |
| diffstat | 7 files changed, 10 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/net/server_event.lua Tue Jan 11 04:22:45 2011 +0000 +++ b/net/server_event.lua Tue Jan 11 05:31:29 2011 +0000 @@ -221,12 +221,12 @@ self.eventhandshake = nil return -1 end - debug( "error during ssl handshake:", err ) if err == "wantwrite" then event = EV_WRITE elseif err == "wantread" then event = EV_READ else + debug( "ssl handshake error:", err ) self.fatalerror = err end end
--- a/net/server_select.lua Tue Jan 11 04:22:45 2011 +0000 +++ b/net/server_select.lua Tue Jan 11 05:31:29 2011 +0000 @@ -530,7 +530,6 @@ _readlistlen = addsocket(_readlist, client, _readlistlen) return true else - out_put( "server.lua: error during ssl handshake: ", tostring(err) ) if err == "wantwrite" and not wrote then _sendlistlen = addsocket(_sendlist, client, _sendlistlen) wrote = true @@ -538,6 +537,7 @@ _readlistlen = addsocket(_readlist, client, _readlistlen) read = true else + out_put( "server.lua: ssl handshake error: ", tostring(err) ) break; end --coroutine_yield( handler, nil, err ) -- handshake not finished
--- a/util/datamanager.lua Tue Jan 11 04:22:45 2011 +0000 +++ b/util/datamanager.lua Tue Jan 11 05:31:29 2011 +0000 @@ -115,7 +115,7 @@ if not data then local mode = lfs.attributes(getpath(username, host, datastore), "mode"); if not mode then - log("debug", "Failed to load "..datastore.." storage ('"..ret.."') for user: "..(username or "nil").."@"..(host or "nil")); + log("debug", "Assuming empty "..datastore.." storage ('"..ret.."') for user: "..(username or "nil").."@"..(host or "nil")); return nil; else -- file exists, but can't be read -- TODO more detailed error checking and logging? @@ -207,7 +207,7 @@ if not data then local mode = lfs.attributes(getpath(username, host, datastore, "list"), "mode"); if not mode then - log("debug", "Failed to load "..datastore.." storage ('"..ret.."') for user: "..(username or "nil").."@"..(host or "nil")); + log("debug", "Assuming empty "..datastore.." storage ('"..ret.."') for user: "..(username or "nil").."@"..(host or "nil")); return nil; else -- file exists, but can't be read -- TODO more detailed error checking and logging?
--- a/util/sasl/anonymous.lua Tue Jan 11 04:22:45 2011 +0000 +++ b/util/sasl/anonymous.lua Tue Jan 11 05:31:29 2011 +0000 @@ -16,7 +16,7 @@ local log = require "util.logger".init("sasl"); local generate_uuid = require "util.uuid".generate; -module "anonymous" +module "sasl.anonymous" --========================= --SASL ANONYMOUS according to RFC 4505 @@ -43,4 +43,4 @@ registerMechanism("ANONYMOUS", {"anonymous"}, anonymous); end -return _M; \ No newline at end of file +return _M;
--- a/util/sasl/digest-md5.lua Tue Jan 11 04:22:45 2011 +0000 +++ b/util/sasl/digest-md5.lua Tue Jan 11 05:31:29 2011 +0000 @@ -24,7 +24,7 @@ local log = require "util.logger".init("sasl"); local generate_uuid = require "util.uuid".generate; -module "digest-md5" +module "sasl.digest-md5" --========================= --SASL DIGEST-MD5 according to RFC 2831 @@ -240,4 +240,4 @@ registerMechanism("DIGEST-MD5", {"plain"}, digest); end -return _M; \ No newline at end of file +return _M;
--- a/util/sasl/plain.lua Tue Jan 11 04:22:45 2011 +0000 +++ b/util/sasl/plain.lua Tue Jan 11 05:31:29 2011 +0000 @@ -15,7 +15,7 @@ local saslprep = require "util.encodings".stringprep.saslprep; local log = require "util.logger".init("sasl"); -module "plain" +module "sasl.plain" -- ================================ -- SASL PLAIN according to RFC 4616
