prosody
8d6f367bed8c
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 @ 7686:8d6f367bed8c

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 07 Oct 2016 16:52:18 +0200
parent 7666:03aa330562ed
parent 7679:589e27b47d56
child 7868:11fcdef5022f
comparison
equal deleted inserted replaced
7669:b332db1baf0b 7686:8d6f367bed8c
387 end 387 end
388 end 388 end
389 elseif session.direction == "outgoing" then 389 elseif session.direction == "outgoing" then
390 session.notopen = nil; 390 session.notopen = nil;
391 if not attr.id then 391 if not attr.id then
392 log("error", "Stream response from %s did not give us a stream id!", session.to_host); 392 log("warn", "Stream response did not give us a stream id!");
393 session:close({ condition = "undefined-condition", text = "Missing stream ID" }); 393 session:close({ condition = "undefined-condition", text = "Missing stream ID" });
394 return; 394 return;
395 end 395 end
396 session.streamid = attr.id; 396 session.streamid = attr.id;
397 397