ext/common/ApplicationPoolServerExecutable.cpp in passenger-2.2.1 vs ext/common/ApplicationPoolServerExecutable.cpp in passenger-2.2.2

- old
+ new

@@ -206,12 +206,15 @@ Server(int serverSocket, const unsigned int logLevel, const string &spawnServerCommand, const string &logFile, const string &rubyCommand, - const string &user) + const string &user, + const string &passengerTempDir) { + setPassengerTempDir(passengerTempDir); + pool = ptr(new StandardApplicationPool(spawnServerCommand, logFile, rubyCommand, user)); Passenger::setLogLevel(logLevel); this->serverSocket = serverSocket; this->user = user; @@ -593,10 +596,10 @@ int main(int argc, char *argv[]) { try { exeFile = argv[0]; Server server(SERVER_SOCKET_FD, atoi(argv[1]), - argv[2], argv[3], argv[4], argv[5]); + argv[2], argv[3], argv[4], argv[5], argv[6]); return server.start(); } catch (const tracable_exception &e) { P_ERROR("*** Fatal error: " << e.what() << "\n" << e.backtrace()); return 1; } catch (const exception &e) {