prosody
589e27b47d56
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 @ 7679:589e27b47d56

Merge 0.9->0.10
author Kim Alvefur <zash@zash.se>
date Wed, 28 Sep 2016 14:45:02 +0200
parent 7662:946871f6e3c8
parent 7677:8613086779fa
child 7686:8d6f367bed8c
child 7865:a8cc495a65dc
comparison
equal deleted inserted replaced
7674:8027eecc750f 7679:589e27b47d56
371 end 371 end
372 end 372 end
373 elseif session.direction == "outgoing" then 373 elseif session.direction == "outgoing" then
374 session.notopen = nil; 374 session.notopen = nil;
375 if not attr.id then 375 if not attr.id then
376 log("error", "Stream response from %s did not give us a stream id!", session.to_host); 376 log("warn", "Stream response did not give us a stream id!");
377 session:close({ condition = "undefined-condition", text = "Missing stream ID" }); 377 session:close({ condition = "undefined-condition", text = "Missing stream ID" });
378 return; 378 return;
379 end 379 end
380 session.streamid = attr.id; 380 session.streamid = attr.id;
381 381