0
@@ -225,9 +225,35 @@
0
   int serverSocket;
0
   
0
   void restartServer() {
0
-		int fds[2];
0
+		int fds[2], ret;
0
     pid_t pid;
0
     
0
+		if (serverPid != 0) {
0
+			time_t begin;
1
+			bool done;
0
+			
0
+			// Shutdown existing server instance.
0
+			do {
0
+				ret = close(serverSocket);
0
+			} while (ret == -1 && errno == EINTR);
0
+			
0
+			P_DEBUG("Waiting for existing ApplicationPoolServerExecutable to exit...");
0
+			begin = time(NULL);
0
+			while (!done && time(NULL) < begin + 5) {
0
+				done = waitpid(serverPid, NULL, WNOHANG) > 0;
0
+				usleep(100000);
0
+			}
0
+			if (done) {
0
+				P_DEBUG("ApplicationPoolServerExecutable exited.");
0
+			} else {
0
+				P_DEBUG("ApplicationPoolServerExecutable not exited in time. Killing it...");
0
+				kill(serverPid, SIGTERM);
0
+				waitpid(serverPid, NULL, 0);
0
+			}
0
+			serverSocket = -1;
0
+			serverPid = 0;
0
+		}
0
+		
0
     if (socketpair(AF_UNIX, SOCK_STREAM, 0, fds) == -1) {
0
       throw SystemException("Cannot create a Unix socket pair", errno);
0
     }
0
@@ -310,6 +336,7 @@
0
     m_rubyCommand(rubyCommand),
0
     m_user(user) {
0
     serverSocket = -1;
0
+		serverPid = 0;
0
     restartServer();
0
   }
0