diff options
| author | Matthew Wild <mwild1@gmail.com> | 2011-06-07 01:29:34 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2011-06-07 01:29:34 +0100 |
| commit | 7d8433ac020c30ba9d3a73956ecabf6822e97d76 (patch) | |
| tree | b14478387b7fa4ac1cf1e954ca9515f983df0291 | |
| parent | cc5269517df6d8643437875bb49baec4bd3e6f87 (diff) | |
| parent | 7c6db5e1b2d8579501981b1010574f0363330d28 (diff) | |
| download | prosody-7d8433ac020c30ba9d3a73956ecabf6822e97d76.tar.gz prosody-7d8433ac020c30ba9d3a73956ecabf6822e97d76.zip | |
Merge 0.8->trunk
| -rw-r--r-- | plugins/mod_bosh.lua | 10 | ||||
| -rw-r--r-- | plugins/mod_dialback.lua | 8 | ||||
| -rw-r--r-- | plugins/mod_storage_sql.lua | 2 | ||||
| -rw-r--r-- | tools/migration/migrator/prosody_sql.lua | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/plugins/mod_bosh.lua b/plugins/mod_bosh.lua index c2c7eae9..a6b84367 100644 --- a/plugins/mod_bosh.lua +++ b/plugins/mod_bosh.lua @@ -125,11 +125,11 @@ function handle_request(method, body, request) local session = sessions[request.sid]; if session then - -- Session was marked as inactive, since we have - -- a request open now, unmark it - if inactive_sessions[session] then - inactive_sessions[session] = nil; - end + -- Session was marked as inactive, since we have + -- a request open now, unmark it + if inactive_sessions[session] and #session.requests > 0 then + inactive_sessions[session] = nil; + end local r = session.requests; log("debug", "Session %s has %d out of %d requests open", request.sid, #r, session.bosh_hold); diff --git a/plugins/mod_dialback.lua b/plugins/mod_dialback.lua index 91291e24..e27f8657 100644 --- a/plugins/mod_dialback.lua +++ b/plugins/mod_dialback.lua @@ -60,7 +60,7 @@ module:hook("stanza/jabber:server:dialback:result", function(event) return true; end - dialback_requests[attr.from] = origin; + dialback_requests[attr.from.."/"..origin.streamid] = origin; if not origin.from_host then -- Just used for friendlier logging @@ -83,8 +83,8 @@ module:hook("stanza/jabber:server:dialback:verify", function(event) if origin.type == "s2sout_unauthed" or origin.type == "s2sout" then local attr = stanza.attr; - local dialback_verifying = dialback_requests[attr.from]; - if dialback_verifying then + local dialback_verifying = dialback_requests[attr.from.."/"..(attr.id or "")]; + if dialback_verifying and attr.from == origin.to_host then local valid; if attr.type == "valid" then s2s_make_authenticated(dialback_verifying, attr.from); @@ -101,7 +101,7 @@ module:hook("stanza/jabber:server:dialback:verify", function(event) st.stanza("db:result", { from = attr.to, to = attr.from, id = attr.id, type = valid }) :text(dialback_verifying.hosts[attr.from].dialback_key)); end - dialback_requests[attr.from] = nil; + dialback_requests[attr.from.."/"..(attr.id or "")] = nil; end return true; end diff --git a/plugins/mod_storage_sql.lua b/plugins/mod_storage_sql.lua index 57331ac0..055d6599 100644 --- a/plugins/mod_storage_sql.lua +++ b/plugins/mod_storage_sql.lua @@ -93,7 +93,7 @@ local function create_table() if not(ok and commit_ok) then module:log("warn", "Failed to create index (%s), lookups may not be optimised", err or commit_err); end - else -- COMPAT: Upgrade tables from 0.8.0 + elseif params.driver == "MySQL" then -- COMPAT: Upgrade tables from 0.8.0 -- Failed to create, but check existing MySQL table here local stmt = connection:prepare("SHOW COLUMNS FROM prosody WHERE Field='value' and Type='text'"); local ok = stmt:execute(); diff --git a/tools/migration/migrator/prosody_sql.lua b/tools/migration/migrator/prosody_sql.lua index ec86417c..27b5835e 100644 --- a/tools/migration/migrator/prosody_sql.lua +++ b/tools/migration/migrator/prosody_sql.lua @@ -42,7 +42,7 @@ local function create_table(connection, params) ok, err = assert(stmt:execute()); commit_ok, commit_err = assert(connection:commit()); end - else -- COMPAT: Upgrade tables from 0.8.0 + elseif params.driver == "MySQL" then -- COMPAT: Upgrade tables from 0.8.0 -- Failed to create, but check existing MySQL table here local stmt = connection:prepare("SHOW COLUMNS FROM prosody WHERE Field='value' and Type='text'"); local ok = stmt:execute(); |