Merge 0.12->trunk
authorKim Alvefur <zash@zash.se>
Mon, 01 May 2023 22:24:13 +0200
changeset 13096 bc46cfe7c037
parent 13093 41598b7ec543 (current diff)
parent 13095 214a679823e8 (diff)
child 13097 93c68c454cb8
Merge 0.12->trunk
plugins/mod_csi_simple.lua
--- a/plugins/mod_csi_simple.lua	Sun Apr 30 23:45:55 2023 +0200
+++ b/plugins/mod_csi_simple.lua	Mon May 01 22:24:13 2023 +0200
@@ -166,6 +166,10 @@
 		session.conn:pause_writes();
 		session.csi_measure_buffer_hold = measure_buffer_hold();
 		session.csi_counter = 0;
+		if session.csi_resume then
+			timer.stop(session.csi_resume);
+			session.csi_resume = nil;
+		end
 		filters.add_filter(session, "stanzas/out", manage_buffer);
 		filters.add_filter(session, "bytes/in", flush_buffer);
 	else
@@ -177,6 +181,10 @@
 	filters.remove_filter(session, "stanzas/out", manage_buffer);
 	filters.remove_filter(session, "bytes/in", flush_buffer);
 	session.csi_counter = nil;
+	if session.csi_resume then
+		timer.stop(session.csi_resume);
+		session.csi_resume = nil;
+	end
 	if session.csi_measure_buffer_hold then
 		session.csi_measure_buffer_hold();
 		session.csi_measure_buffer_hold = nil;