Fri, 20 Nov 2009 04:39:54 +0000
s2smanager: Queue db:verify unless we already sent a db:result (if we had then it can could a dialback deadlock). Also remove some redundant code which could cause a db:result to be sent while still negotiating features (e.g. TLS) and break things. Collectively these fix a 'random' s2s failure (usually with ejabberd for some reason) - resulting in an 'unbound prefix' XML error, or 'ssl handshake failure'. Was this commit message long enough? I think so.
-- Prosody IM -- Copyright (C) 2008-2009 Matthew Wild -- Copyright (C) 2008-2009 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information. -- local connlisteners_register = require "net.connlisteners".register; local new_request = require "net.httpserver".new_request; local request_reader = require "net.httpserver".request_reader; local requests = {}; -- Open requests local httpserver = { default_port = 80, default_mode = "*a" }; function httpserver.listener(conn, data) local request = requests[conn]; if not request then request = new_request(conn); requests[conn] = request; -- If using HTTPS, request is secure if conn.ssl() then request.secure = true; end end if data then request_reader(request, data); end end function httpserver.disconnect(conn, err) local request = requests[conn]; if request and not request.destroyed then request.conn = nil; request_reader(request, nil); end requests[conn] = nil; end connlisteners_register("httpserver", httpserver);