Comparison

Merge 0.9->0.10

comparison

equal deleted inserted replaced

-:c2d144d3f8dd
+:769a3577dd85
 			end
 			log("debug", "Sending stream features: %s", tostring(features));
 			send(features);
 		end
+		session.notopen = nil;
 	elseif session.direction == "outgoing" then
+		session.notopen = nil;
 		-- If we are just using the connection for verifying dialback keys, we won't try and auth it
 		if not attr.id then error("stream response did not give us a streamid!!!"); end
 		session.streamid = attr.id;
 		if session.secure and not session.cert_chain_status then
 			else
 				mark_connected(session);
 			end
 		end
 	end
-	session.notopen = nil;
 end
 function stream_callbacks.streamclosed(session)
 	(session.log or log)("debug", "Received </stream:stream>");
 	session:close(false);
 end
 function stream_callbacks.error(session, error, data)
 	if error == "no-stream" then
+		session.log("debug", "Invalid opening stream header (%s)", (data:gsub("^([^\1]+)\1", "{%1}")));
 		session:close("invalid-namespace");
 	elseif error == "parse-error" then
 		session.log("debug", "Server-to-server XML parse error: %s", tostring(error));
 		session:close("not-well-formed");
 	elseif error == "stream-error" then
 	session.notopen = true;
 	function session.reset_stream()
 		session.notopen = true;
+		session.streamid = nil;
 		session.stream:reset();
 	end
 	session.stream_attrs = session_stream_attrs;