0
@@ -147,7 +147,7 @@ subdir 'ext/apache2' do
0
   ] do
0
     create_executable "ApplicationPoolServerExecutable",
0
       'ApplicationPoolServerExecutable.cpp Utils.o Logging.o',
0
-			"-I.. #{CXXFLAGS} #{LDFLAGS} ../boost/src/libboost_thread.a -lpthread"
0
+			"-I.. #{CXXFLAGS} #{LDFLAGS} -DPASSENGER_DEBUG ../boost/src/libboost_thread.a -lpthread"
0
   end
0
   
0
   desc "Install mod_passenger Apache 2 module"

0
@@ -143,10 +143,6 @@ public:
0
           "already been closed.");
0
       }
0
       try {
0
-			/* fprintf(stderr, "Block: ");
0
-			fwrite(block, 1, size, stderr);
0
-			fprintf(stderr, "\n");
0
-			fflush(stderr); */
0
         MessageChannel(stream).writeRaw(block, size);
0
       } catch (const SystemException &e) {
0
         throw SystemException("An error occured while sending the "
0
@@ -155,7 +151,9 @@ public:
0
     }
0
     
0
     /**
0
-		 * Get the I/O stream's file descriptor. This steam is full-duplex.
0
+		 * Get the I/O stream's file descriptor. This steam is full-duplex,
0
+		 * and will be automatically closed upon Session's destruction,
0
+		 * unless discardStream() is called.
0
      *
0
      * @pre The stream has not been fully closed.
0
      */
0
@@ -177,6 +175,12 @@ public:
0
     virtual void closeStream() = 0;
0
     
0
     /**
0
+		 * Discard the I/O stream's file descriptor, so that Session won't automatically
0
+		 * closed it upon Session's destruction.
0
+		 */
0
+		virtual void discardStream() = 0;
0
+		
0
+		/**
0
      * Get the process ID of the application instance that belongs to this session.
0
      */
0
     virtual pid_t getPid() const = 0;
0
@@ -229,6 +233,10 @@ private:
0
       }
0
     }
0
     
0
+		virtual void discardStream() {
0
+			fd = -1;
0
+		}
0
+		
0
     virtual pid_t getPid() const {
0
       return pid;
0
     }

0
@@ -19,6 +19,7 @@
0
 #define _PASSENGER_APPLICATION_POOL_SERVER_H_
0
 
0
 #include <boost/shared_ptr.hpp>
0
+#include <boost/thread/mutex.hpp>
0
 
0
 #include <sys/types.h>
0
 #include <sys/wait.h>
0
@@ -135,6 +136,8 @@ private:
0
      */
0
     int server;
0
     
0
+		mutex lock;
0
+		
0
     ~SharedData() {
0
       close(server);
0
     }
0
@@ -161,6 +164,7 @@ private:
0
     
0
     virtual ~RemoteSession() {
0
       closeStream();
0
+			mutex::scoped_lock(data->lock);
0
       MessageChannel(data->server).write("close", toString(id).c_str(), NULL);
0
     }
0
     
0
@@ -187,6 +191,10 @@ private:
0
       }
0
     }
0
     
0
+		virtual void discardStream() {
0
+			fd = -1;
0
+		}
0
+		
0
     virtual pid_t getPid() const {
0
       return pid;
0
     }
0
@@ -199,7 +207,10 @@ private:
0
    */
0
   class Client: public ApplicationPool {
0
   private:
0
-		SharedDataPtr data;
0
+		// The smart pointer only serves to keep the shared data alive.
0
+		// We access the shared data via a normal pointer, for performance.
0
+		SharedDataPtr dataSmartPointer;
0
+		SharedData *data;
0
     
0
   public:
0
     /**
0
@@ -208,27 +219,32 @@ private:
0
      * @param sock The newly established socket connection with the ApplicationPoolServer.
0
      */
0
     Client(int sock) {
0
-			data = ptr(new SharedData());
0
+			dataSmartPointer = ptr(new SharedData());
0
+			data = dataSmartPointer.get();
0
       data->server = sock;
0
     }
0
     
0
     virtual void clear() {
0
       MessageChannel channel(data->server);
0
+			mutex::scoped_lock l(data->lock);
0
       channel.write("clear", NULL);
0
     }
0
     
0
     virtual void setMaxIdleTime(unsigned int seconds) {
0
       MessageChannel channel(data->server);
0
+			mutex::scoped_lock l(data->lock);
0
       channel.write("setMaxIdleTime", toString(seconds).c_str(), NULL);
0
     }
0
     
0
     virtual void setMax(unsigned int max) {
0
       MessageChannel channel(data->server);
0
+			mutex::scoped_lock l(data->lock);
0
       channel.write("setMax", toString(max).c_str(), NULL);
0
     }
0
     
0
     virtual unsigned int getActive() const {
0
       MessageChannel channel(data->server);
0
+			mutex::scoped_lock l(data->lock);
0
       vector<string> args;
0
       
0
       channel.write("getActive", NULL);
0
@@ -238,6 +254,7 @@ private:
0
     
0
     virtual unsigned int getCount() const {
0
       MessageChannel channel(data->server);
0
+			mutex::scoped_lock l(data->lock);
0
       vector<string> args;
0
       
0
       channel.write("getCount", NULL);
0
@@ -247,6 +264,7 @@ private:
0
     
0
     virtual pid_t getSpawnServerPid() const {
0
       MessageChannel channel(data->server);
0
+			mutex::scoped_lock l(data->lock);
0
       vector<string> args;
0
       
0
       channel.write("getSpawnServerPid", NULL);
0
@@ -262,8 +280,10 @@ private:
0
       const string &spawnMethod = "smart"
0
     ) {
0
       MessageChannel channel(data->server);
0
+			mutex::scoped_lock l(data->lock);
0
       vector<string> args;
0
       int stream;
0
+			bool result;
0
       
0
       try {
0
         channel.write("get", appRoot.c_str(),
0
@@ -275,18 +295,27 @@ private:
0
       } catch (const SystemException &) {
0
         throw IOException("The ApplicationPool server exited unexpectedly.");
0
       }
0
-			if (!channel.read(args)) {
0
-				throw IOException("The ApplicationPool server unexpectedly closed the connection.");
0
+			try {
0
+				result = channel.read(args);
0
+			} catch (const SystemException &e) {
0
+				throw SystemException("Could not read a message from "
0
+					"the ApplicationPool server", e.code());
0
+			}
0
+			if (!result) {
0
+				throw IOException("The ApplicationPool server unexpectedly "
0
+					"closed the connection.");
0
       }
0
       if (args[0] == "ok") {
0
         stream = channel.readFileDescriptor();
0
-				return ptr(new RemoteSession(data, atoi(args[1]), atoi(args[2]), stream));
0
+				return ptr(new RemoteSession(dataSmartPointer,
0
+					atoi(args[1]), atoi(args[2]), stream));
0
       } else if (args[0] == "SpawnException") {
0
         if (args[2] == "true") {
0
           string errorPage;
0
           
0
           if (!channel.readScalar(errorPage)) {
0
-						throw IOException("The ApplicationPool server unexpectedly closed the connection.");
0
+						throw IOException("The ApplicationPool server "
0
+							"unexpectedly closed the connection.");
0
           }
0
           throw SpawnException(args[1], errorPage);
0
         } else {
0
@@ -295,7 +324,8 @@ private:
0
       } else if (args[0] == "IOException") {
0
         throw IOException(args[1]);
0
       } else {
0
-				throw IOException("The ApplicationPool server returned an unknown message.");
0
+				throw IOException("The ApplicationPool server returned "
0
+					"an unknown message: " + toString(args));
0
       }
0
     }
0
   };

0
@@ -224,16 +224,22 @@ private:
0
    * The entry point of the thread that handles the client connection.
0
    */
0
   void threadMain(const weak_ptr<Client> self) {
0
-		try {
0
-			vector<string> args;
0
-			while (true) {
0
+		vector<string> args;
0
+		while (true) {
0
+			try {
0
         if (!channel.read(args)) {
0
           // Client closed connection.
0
           break;
0
         }
0
-				
0
-				P_TRACE(3, "Client " << this << ": received message: " <<
0
-					toString(args));
0
+			} catch (const SystemException &e) {
0
+				P_WARN("Exception in ApplicationPoolServer client thread during "
0
+					"reading of a message: " << e.what());
0
+				break;
0
+			}
0
+			
0
+			P_TRACE(4, "Client " << this << ": received message: " <<
0
+				toString(args));
0
+			try {
0
         if (args[0] == "get" && args.size() == 6) {
0
           processGet(args);
0
         } else if (args[0] == "close" && args.size() == 2) {
0
@@ -254,10 +260,12 @@ private:
0
           processUnknownMessage(args);
0
           break;
0
         }
0
+			} catch (const exception &e) {
0
+				P_WARN("Uncaught exception in ApplicationPoolServer client thread:\n"
0
+					<< "   message: " << toString(args) << "\n"
0
+					<< "   exception: " << e.what());
0
+				break;
0
       }
0
-		} catch (const exception &e) {
0
-			P_WARN("Uncaught exception in ApplicationPoolServer client thread: " <<
0
-				e.what());
0
     }
0
     
0
     mutex::scoped_lock l(server.lock);

0
@@ -407,7 +407,6 @@ public:
0
       apr_bucket *b;
0
       Application::SessionPtr session;
0
       
0
-			P_DEBUG("Processing HTTP request: " << r->uri);
0
       try {
0
         const char *defaultUser, *environment, *spawnMethod;
0
         ServerConfig *sconfig;
0
@@ -462,6 +461,10 @@ public:
0
       Container *container = new Container();
0
       container->session = session;
0
       apr_pool_cleanup_register(r->pool, container, Container::cleanup, apr_pool_cleanup_null);
0
+			
0
+			// Apparently apr_bucket_pipe or apr_brigade closes the
0
+			// file descriptor for us.
0
+			session->discardStream();
0
 
0
       return OK;
0
     } catch (const exception &e) {