0
@@ -127,9 +127,7 @@
0
       free(pollResult);
0
       // Apparently APR does not always close the file descriptor,
0
       // so we do it manually.
0
-			for (set<int>::const_iterator it(fds.begin()); it != fds.end(); it++) {
0
-				close(*it);
0
-			}
0
+			closeAll();
0
     }
0
   
0
     void add(int fd) {
0
@@ -191,6 +189,12 @@
0
       *fileDescriptors = pollResult;
0
       return num;
0
     }
0
+		
0
+		void closeAll() {
0
+			for (set<int>::const_iterator it(fds.begin()); it != fds.end(); it++) {
0
+				close(*it);
0
+			}
0
+		}
0
   };
0
   
0
   StandardApplicationPool pool;
0
@@ -201,7 +205,6 @@
0
   SocketDemultiplexer demultiplexer;
0
   
0
   void threadMain() {
0
-		demultiplexer.add(serverSocket);
0
     while (!done) {
0
       int *fds;
0
       unsigned int num;
0
@@ -287,7 +290,8 @@
0
   } */
0
   
0
   void finalize() {
0
-		close(serverSocket);
0
+		demultiplexer.closeAll();
0
+		// serverSocket will be closed by demultiplexer.
0
     close(connectSocket);
0
   }
0
   
0
@@ -306,6 +310,7 @@
0
     connectSocket = fds[1];
0
     done = false;
0
     detached = false;
0
+		demultiplexer.add(serverSocket);
0
     thr = new thread(ServerThreadDelegator(this));
0
   }
0
   

0
@@ -111,7 +111,7 @@
0
       close(fds[1]);
0
       
0
       // Close all other file descriptors
0
-			for (int i = sysconf(_SC_OPEN_MAX); i >= 0; i--) {
0
+			for (long i = sysconf(_SC_OPEN_MAX) - 1; i >= 0; i--) {
0
         if (i != STDIN_FILENO && i != STDOUT_FILENO && i != STDERR_FILENO) {
0
           close(i);
0
         }

0
@@ -3,16 +3,38 @@
0
 #include "Utils.cpp"
0
 #include <cstring>
0
 #include <unistd.h>
0
+#include <errno.h>
0
 
0
 using namespace Passenger;
0
 
0
 namespace tut {
0
+	static bool firstRun = true;
0
+	static unsigned int initialFileDescriptors;
0
+
0
   struct ApplicationPoolClientServerTest {
0
     ApplicationPoolServerPtr server;
0
     
0
     ApplicationPoolClientServerTest() {
0
+			if (firstRun) {
0
+				initialFileDescriptors = countOpenFileDescriptors();
0
+				firstRun = false;
0
+			}
0
       server = ptr(new ApplicationPoolServer("support/spawn_server_mock.rb"));
0
     }
0
+		
0
+		unsigned int countOpenFileDescriptors() {
0
+			int ret;
0
+			unsigned int result = 0;
0
+			for (long i = sysconf(_SC_OPEN_MAX) - 1; i >= 0; i--) {
0
+				do {
0
+					ret = dup2(i, i);
0
+				} while (ret == -1 && errno == EINTR);
0
+				if (ret != -1) {
0
+					result++;
0
+				}
0
+			}
0
+			return result;
0
+		}
0
   };
0
 
0
   DEFINE_TEST_GROUP(ApplicationPoolClientServerTest);
0
@@ -52,6 +74,13 @@
0
     } else {
0
       waitpid(pid, NULL, 0);
0
     }
0
+	}
0
+	
0
+	TEST_METHOD(5) {
0
+		// ApplicationPoolServer should not leak file descriptors after running all
0
+		// of the above tests.
0
+		server = ApplicationPoolServerPtr();
0
+		ensure_equals(countOpenFileDescriptors(), initialFileDescriptors);
0
   }
0
 }