0
@@ -57,7 +57,8 @@ passenger_config_create_dir(apr_pool_t *p, char *dirspec) {
0
   config->autoDetectRails = DirConfig::UNSET;
0
   config->autoDetectRack = DirConfig::UNSET;
0
   config->allowModRewrite = DirConfig::UNSET;
0
-	config->env = NULL;
0
+	config->railsEnv = NULL;
0
+	config->rackEnv = NULL;
0
   config->spawnMethod = DirConfig::SM_UNSET;
0
   return config;
0
 }
0
@@ -76,7 +77,8 @@ passenger_config_merge_dir(apr_pool_t *p, void *basev, void *addv) {
0
   config->autoDetectRails = (add->autoDetectRails == DirConfig::UNSET) ? base->autoDetectRails : add->autoDetectRails;
0
   config->autoDetectRack = (add->autoDetectRack == DirConfig::UNSET) ? base->autoDetectRack : add->autoDetectRack;
0
   config->allowModRewrite = (add->allowModRewrite == DirConfig::UNSET) ? base->allowModRewrite : add->allowModRewrite;
0
-	config->env = (add->env == NULL) ? base->env : add->env;
0
+	config->railsEnv = (add->railsEnv == NULL) ? base->railsEnv : add->railsEnv;
0
+	config->rackEnv = (add->rackEnv == NULL) ? base->rackEnv : add->rackEnv;
0
   config->spawnMethod = (add->spawnMethod == DirConfig::SM_UNSET) ? base->spawnMethod : add->spawnMethod;
0
   return config;
0
 }
0
@@ -187,7 +189,7 @@ cmd_rails_ruby(cmd_parms *cmd, void *pcfg, const char *arg) {
0
 static const char *
0
 cmd_rails_env(cmd_parms *cmd, void *pcfg, const char *arg) {
0
   DirConfig *config = (DirConfig *) pcfg;
0
-	config->env = arg;
0
+	config->railsEnv = arg;
0
   return NULL;
0
 }
0
 
0
@@ -271,6 +273,13 @@ cmd_rack_auto_detect(cmd_parms *cmd, void *pcfg, int arg) {
0
   return NULL;
0
 }
0
 
0
+static const char *
0
+cmd_rack_env(cmd_parms *cmd, void *pcfg, const char *arg) {
0
+	DirConfig *config = (DirConfig *) pcfg;
0
+	config->rackEnv = arg;
0
+	return NULL;
0
+}
0
+
0
 
0
 /*************************************************
0
  * Obsolete settings
0
@@ -354,6 +363,11 @@ const command_rec passenger_commands[] = {
0
     NULL,
0
     RSRC_CONF,
0
     "Whether auto-detection of Rack applications should be enabled."),
0
+	AP_INIT_TAKE1("RackEnv",
0
+		(Take1Func) cmd_rack_env,
0
+		NULL,
0
+		RSRC_CONF,
0
+		"The environment under which a Rack app must run."),
0
   
0
   // Obsolete options.
0
   AP_INIT_TAKE1("RailsSpawnServer",

0
@@ -46,16 +46,26 @@
0
       enum Threeway { ENABLED, DISABLED, UNSET };
0
       
0
       std::set<std::string> base_uris;
0
+			
0
+			/** Whether to autodetect Rails applications. */
0
       Threeway autoDetectRails;
0
+			
0
+			/** Whether to autodetect Rack applications. */
0
       Threeway autoDetectRack;
0
+			
0
+			/** Whether mod_rewrite should be allowed for Rails applications. */
0
       Threeway allowModRewrite;
0
       
0
-			/** The environment (i.e. value for RAILS_ENV) under which the
0
-			 * Rails application should operate. */
0
-			const char *env;
0
+			/** The environment (i.e. value for RAILS_ENV) under which
0
+			 * Rails applications should operate. */
0
+			const char *railsEnv;
0
+			
0
+			/** The environment (i.e. value for RACK_ENV) under which
0
+			 * Rack applications should operate. */
0
+			const char *rackEnv;
0
       
0
-			/** The spawn method to use. */
0
       enum SpawnMethod { SM_UNSET, SM_SMART, SM_CONSERVATIVE };
0
+			/** The Rails spawn method to use. */
0
       SpawnMethod spawnMethod;
0
     };
0
     

0
@@ -48,7 +48,8 @@ using namespace Passenger;
0
 extern "C" module AP_MODULE_DECLARE_DATA passenger_module;
0
 
0
 #define DEFAULT_RUBY_COMMAND "ruby"
0
-#define DEFAULT_RAILS_ENV "production"
0
+#define DEFAULT_RAILS_ENV    "production"
0
+#define DEFAULT_RACK_ENV     "production"
0
 
0
 
0
 /**
0
@@ -586,10 +587,18 @@ public:
0
         } else {
0
           defaultUser = "nobody";
0
         }
0
-				if (config->env == NULL) {
0
-					environment = DEFAULT_RAILS_ENV;
0
+				if (mapper.getApplicationType() == DirectoryMapper::RAILS) {
0
+					if (config->railsEnv == NULL) {
0
+						environment = DEFAULT_RAILS_ENV;
0
+					} else {
0
+						environment = config->railsEnv;
0
+					}
0
         } else {
0
-					environment = config->env;
0
+					if (config->rackEnv == NULL) {
0
+						environment = DEFAULT_RACK_ENV;
0
+					} else {
0
+						environment = config->rackEnv;
0
+					}
0
         }
0
         if (config->spawnMethod == DirConfig::SM_CONSERVATIVE) {
0
           spawnMethod = "conservative";