Merge branch 'main' into jkarneges/timer-fix

fastly · Feb 25, 2025 · 1c5abec · 1c5abec
2 parents c01896a + 0d66c35
commit 1c5abec
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/handler/handlerengine.cpp b/src/handler/handlerengine.cpp
@@ -826,8 +826,9 @@ class AcceptWorker : public Deferred
 
 	QList<std::shared_ptr<HttpSession>> takeSessions()
 	{
-		QList<std::shared_ptr<HttpSession>> out = sessions;
-		sessions.clear();
+		// swap instead of std::move since sessions is a member and should have a known state
+		QList<std::shared_ptr<HttpSession>> out;
+		out.swap(sessions);
 
 		foreach(const std::shared_ptr<HttpSession> &hs, out)
 			hs->setParent(0);