Comparison

Merge 0.11->trunk

comparison

equal deleted inserted replaced

-:9a3ebdd65f9c
+:11186af62c87
 			-- Grace time to process data from authenticated cleanly-closed stream
 			add_task(stream_close_timeout, function ()
 				if not session.destroyed then
 					session.log("warn", "Failed to receive a stream close response, closing connection anyway...");
 					sm_destroy_session(session, reason_text);
-					conn:close();
+					if conn then conn:close(); end
 				end
 			end);
 		else
 			sm_destroy_session(session, reason_text);
-			conn:close();
+			if conn then conn:close(); end
 		end
 	else
 		local reason_text = (reason and (reason.name or reason.text or reason.condition)) or reason;
 		sm_destroy_session(session, reason_text);
 	end
 		end
 	end
 end, 200);
 function runner_callbacks:ready()
-	self.data.conn:resume();
+	if self.data.conn then
+		self.data.conn:resume();
+	else
+		(self.data.log or log)("debug", "Session has no connection to resume");
+	end
 end
 function runner_callbacks:waiting()
-	self.data.conn:pause();
+	if self.data.conn then
+		self.data.conn:pause();
+	else
+		(self.data.log or log)("debug", "Session has no connection to pause while waiting");
+	end
 end
 function runner_callbacks:error(err)
 	(self.data.log or log)("error", "Traceback[c2s]: %s", err);
 end