0
@@ -576,7 +576,7 @@ const command_rec passenger_commands[] = {
0
     (Take1Func) cmd_rails_framework_spawner_idle_time,
0
     NULL,
0
     RSRC_CONF,
0
-		"The maximum number of seconds that an application spawner may be idle before it is shutdown."),
0
+		"The maximum number of seconds that a framework spawner may be idle before it is shutdown."),
0
   AP_INIT_TAKE1("RailsAppSpawnerIdleTime", // TODO: document this
0
     (Take1Func) cmd_rails_app_spawner_idle_time,
0
     NULL,

0
@@ -394,8 +394,8 @@ private:
0
           mapper.getEnvironment(),
0
           config->getSpawnMethodString(),
0
           mapper.getApplicationTypeString(),
0
-					config->appSpawnerTimeout,
0
           config->frameworkSpawnerTimeout,
0
+					config->appSpawnerTimeout,
0
           config->getMaxRequests(),
0
           config->getMemoryLimit()));
0
         P_TRACE(3, "Forwarding " << r->uri << " to PID " << session->getPid());

0
@@ -197,8 +197,8 @@ struct SpawnOptions {
0
    * as a message to be sent to the spawn server.
0
    */
0
   void toVector(vector<string> &vec) const {
0
-		if (vec.capacity() < vec.size() + 9) {
0
-			vec.reserve(vec.size() + 9);
0
+		if (vec.capacity() < vec.size() + 10) {
0
+			vec.reserve(vec.size() + 10);
0
     }
0
     appendKeyValue (vec, "app_root",        appRoot);
0
     appendKeyValue (vec, "lower_privilege", lowerPrivilege ? "true" : "false");