fix(Net): PollSet loop; suppress test WebSocket handler shutdown IOEx…

…eption
pocoproject · Nov 26, 2023 · 405e0ea · 405e0ea
1 parent 351dcae
commit 405e0ea
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Net/src/PollSet.cpp b/Net/src/PollSet.cpp
@@ -171,7 +171,7 @@ class PollSetImpl
 		Poco::Timespan remainingTime(timeout);
 		int rc;
 
-		do
+		while (true)
 		{
 			Poco::Timestamp start;
 			rc = epoll_wait(_epollfd, &_events[0],
@@ -195,8 +195,8 @@ class PollSetImpl
 				}
 				else SocketImpl::error();
 			}
+			break;
 		}
-		while (false);
 
 		ScopedLock lock(_mutex);
 

diff --git a/Net/testsuite/src/WebSocketTest.cpp b/Net/testsuite/src/WebSocketTest.cpp
@@ -35,6 +35,7 @@ using Poco::Net::SocketStream;
 using Poco::Net::WebSocket;
 using Poco::Net::WebSocketException;
 using Poco::Net::ConnectionAbortedException;
+using Poco::IOException;
 
 
 namespace
@@ -80,6 +81,9 @@ namespace
 			catch (ConnectionAbortedException&)
 			{
 			}
+			catch (IOException&)
+			{
+			}
 		}
 
 	private: