From 7525d32ac0d85ff1957f61ec653f78702093a8a7 Mon Sep 17 00:00:00 2001
From: Adam
Date: Tue, 4 Feb 2014 16:11:43 -0500
Subject: Fix new file descriptor debug log message in socketengine_poll to
 show the correct events

---
 src/socketengines/socketengine_poll.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/socketengines')

diff --git a/src/socketengines/socketengine_poll.cpp b/src/socketengines/socketengine_poll.cpp
index ea7780686..e38e0fac1 100644
--- a/src/socketengines/socketengine_poll.cpp
+++ b/src/socketengines/socketengine_poll.cpp
@@ -137,7 +137,7 @@ bool PollEngine::AddFd(EventHandler* eh, int event_mask)
 	events[index].fd = fd;
 	events[index].events = mask_to_poll(event_mask);
 
-	ServerInstance->Logs->Log("SOCKET", DEBUG,"New file descriptor: %d (%d; index %d)", fd, events[fd].events, index);
+	ServerInstance->Logs->Log("SOCKET", DEBUG,"New file descriptor: %d (%d; index %d)", fd, events[index].events, index);
 	SocketEngine::SetEventMask(eh, event_mask);
 	CurrentSetSize++;
 	return true;
-- 
cgit v1.3.1-10-gc9f91


From d481bf8eb1a2c2dcf27e58c82420e3f35b7670eb Mon Sep 17 00:00:00 2001
From: Attila Molnar
Date: Wed, 5 Feb 2014 18:02:01 +0100
Subject: socketengine_epoll Initialize CurrentSetSize (only used by
 m_httpd_stats)

---
 src/socketengines/socketengine_epoll.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/socketengines')

diff --git a/src/socketengines/socketengine_epoll.cpp b/src/socketengines/socketengine_epoll.cpp
index 6913076a2..f2837777a 100644
--- a/src/socketengines/socketengine_epoll.cpp
+++ b/src/socketengines/socketengine_epoll.cpp
@@ -54,6 +54,7 @@ public:
 
 EPollEngine::EPollEngine()
 {
+	CurrentSetSize = 0;
 	int max = ulimit(4, 0);
 	if (max > 0)
 	{
-- 
cgit v1.3.1-10-gc9f91


From d3d8375e232de4615b49f654b7e2d20c955eee6d Mon Sep 17 00:00:00 2001
From: Attila Molnar
Date: Thu, 13 Feb 2014 14:10:01 +0100
Subject: socketengine_select Reset the values in the timeval struct on *nix
 before select()

---
 src/socketengines/socketengine_select.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/socketengines')

diff --git a/src/socketengines/socketengine_select.cpp b/src/socketengines/socketengine_select.cpp
index c21b200c2..0b5abaf30 100644
--- a/src/socketengines/socketengine_select.cpp
+++ b/src/socketengines/socketengine_select.cpp
@@ -132,7 +132,9 @@ void SelectEngine::OnSetEvent(EventHandler* eh, int old_mask, int new_mask)
 
 int SelectEngine::DispatchEvents()
 {
-	static timeval tval = { 1, 0 };
+	timeval tval;
+	tval.tv_sec = 1;
+	tval.tv_usec = 0;
 
 	fd_set rfdset = ReadSet, wfdset = WriteSet, errfdset = ErrSet;
 
-- 
cgit v1.3.1-10-gc9f91