prosody
1891854b25ac
plugins/mod_s2s/mod_s2s.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Comparison

plugins/mod_s2s/mod_s2s.lua @ 7278:1891854b25ac

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 14 Mar 2016 14:20:37 +0100
parent 7102:250016f5eb7e
parent 7277:7be7108cb6ed
child 7359:a5a080c12c96
comparison
equal deleted inserted replaced
7270:df22e314946c 7278:1891854b25ac
364 end 364 end
365 end 365 end
366 elseif session.direction == "outgoing" then 366 elseif session.direction == "outgoing" then
367 session.notopen = nil; 367 session.notopen = nil;
368 if not attr.id then 368 if not attr.id then
369 log("error", "Stream response did not give us a stream id!"); 369 log("error", "Stream response from %s did not give us a stream id!", session.to_host);
370 session:close({ condition = "undefined-condition", text = "Missing stream ID" }); 370 session:close({ condition = "undefined-condition", text = "Missing stream ID" });
371 return; 371 return;
372 end 372 end
373 session.streamid = attr.id; 373 session.streamid = attr.id;
374 374