Comparison

plugins/mod_bosh.lua @ 7327:d62f0471470f

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 02 Apr 2016 17:13:12 +0200
parent 7286:30b9433a9f3e
parent 7326:d11701e86702
child 7359:a5a080c12c96
comparison
equal deleted inserted replaced
7324:7e6409462f79 7327:d62f0471470f
307 s = st.clone(s); 307 s = st.clone(s);
308 s.attr.xmlns = "jabber:client"; 308 s.attr.xmlns = "jabber:client";
309 end 309 end
310 s = filter("stanzas/out", s); 310 s = filter("stanzas/out", s);
311 --log("debug", "Sending BOSH data: %s", tostring(s)); 311 --log("debug", "Sending BOSH data: %s", tostring(s));
312 if not s then return true end
312 t_insert(session.send_buffer, tostring(s)); 313 t_insert(session.send_buffer, tostring(s));
313 314
314 local oldest_request = r[1]; 315 local oldest_request = r[1];
315 if oldest_request and not session.bosh_processing then 316 if oldest_request and not session.bosh_processing then
316 log("debug", "We have an open request, so sending on that"); 317 log("debug", "We have an open request, so sending on that");