passenger 3.9.2.beta → 4.0.0.rc4

data/doc/users_guide_snippets/rackup_specifications.txt

@@ -65,6 +65,10 @@ run Ramaze::Adapter::Base
 ------------------------------------------------------
 require 'rubygems'
 require 'sinatra'
+
+set :environment, ENV['RACK_ENV'].to_sym
+disable :run, :reload
+
 require 'app.rb'
 
 run Sinatra::Application

data/doc/users_guide_snippets/since_version.txt

@@ -0,0 +1 @@
+**Introduced in version {version}.**

data/doc/users_guide_snippets/support_information.txt

@@ -5,13 +5,8 @@ words: practically any operating system on earth, except Microsoft Windows.
 
 Phusion Passenger is confirmed on a large number of operating systems and Linux
 distributions, including, but not limited to, Ubuntu, Debian, CentOS/Fedora/RHEL,
-Gentoo, Mac OS X, FreeBSD and Solaris. Both 32-bit and 64-bit platforms are supported.
-
-ifdef::apache[]
-The only POSIX-compliant operating system on which Phusion Passenger for Apache is
-known not to work at this time, is OpenBSD. Please use Phusion Passenger for Nginx
-or Phusion Passenger Standalone instead.
-endif::[]
+Gentoo, Mac OS X, FreeBSD and Solaris. OpenBSD is supported since version 5.2.
+Both 32-bit and 64-bit platforms are supported.
 
 Please
 link:http://code.google.com/p/phusion-passenger/issues/list[report a bug]
@@ -27,5 +22,6 @@ if it doesn't work on your POSIX-compliant operating system.
   message here if you're experiencing problems. Support on this forum is provided by the community on a best-effort basis, so a (timely) response is not guaranteed.
 * Email support@phusion.nl if you are a link:https://www.phusionpassenger.com/enterprise[Phusion Passenger Enterprise] customer. Please mention your order reference. If you are not an Enterprise customer, we kindly redirect you to the community discussion forum instead.
 * link:https://www.phusionpassenger.com/commercial_support[Commercial support contracts] are also available.
+* Report security vulnerabilities to support@phusion.nl. We will do our best to respond to you as quickly as we can, so please do not disclose the vulnerability until then.
 
 Please consult link:https://www.phusionpassenger.com/support[the Phusion Passenger website] for a full list of support resources.

data/doc/users_guide_snippets/tips.txt

@@ -109,30 +109,6 @@ you can override Phusion Passenger's Bundler support code by creating a file
 the application startup file. In this file you can do whatever you need to setup Bundler
 or a similar system.
 
-
-[[moving_phusion_passenger]]
-=== Moving Phusion Passenger to a different directory ===
-
-It is possible to relocate the Phusion Passenger files to a different directory. It
-involves two steps:
-
-1. Moving the directory.
-2. Updating the ``PassengerRoot'' configuration option in Apache.
-
-For example, if Phusion Passenger is located in '/opt/passenger/', and you'd like to
-move it to '/usr/local/passenger/', then do this:
-
-1. Run the following command:
-+
-------------------------------------
-mv /opt/passenger /usr/local/passenger
-------------------------------------
-2. Edit your Apache configuration file, and set:
-+
-------------------------------------
-PassengerRoot /usr/local/passenger
-------------------------------------
-
 === Installing multiple Ruby on Rails versions ===
 
 Each Ruby on Rails applications that are going to be deployed may require a

data/ext/apache2/Configuration.cpp

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010, 2011, 2012 Phusion
+ *  Copyright (c) 2010-2013 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -186,10 +186,8 @@ void *
 passenger_config_create_dir(apr_pool_t *p, char *dirspec) {
 	DirConfig *config = create_dir_config_struct(p);
 	config->enabled = DirConfig::UNSET;
-	config->autoDetectRails = DirConfig::UNSET;
-	config->autoDetectRack = DirConfig::UNSET;
-	config->autoDetectWSGI = DirConfig::UNSET;
 	config->ruby = NULL;
+	config->python = NULL;
 	config->environment = NULL;
 	config->appRoot = NULL;
 	config->user = NULL;
@@ -231,10 +229,8 @@ passenger_config_merge_dir(apr_pool_t *p, void *basev, void *addv) {
 		config->rackBaseURIs.insert(*it);
 	}
 	
-	MERGE_THREEWAY_CONFIG(autoDetectRails);
-	MERGE_THREEWAY_CONFIG(autoDetectRack);
-	MERGE_THREEWAY_CONFIG(autoDetectWSGI);
 	MERGE_STR_CONFIG(ruby);
+	MERGE_STR_CONFIG(python);
 	MERGE_STR_CONFIG(environment);
 	MERGE_STR_CONFIG(appRoot);
 	MERGE_STRING_CONFIG(appGroupName);
@@ -283,7 +279,6 @@ DEFINE_SERVER_STR_CONFIG_SETTER(cmd_union_station_gateway_address, unionStationG
 DEFINE_SERVER_INT_CONFIG_SETTER(cmd_union_station_gateway_port, unionStationGatewayPort, int, 1)
 DEFINE_SERVER_STR_CONFIG_SETTER(cmd_union_station_gateway_cert, unionStationGatewayCert)
 DEFINE_SERVER_STR_CONFIG_SETTER(cmd_union_station_proxy_address, unionStationProxyAddress)
-DEFINE_SERVER_STR_CONFIG_SETTER(cmd_union_station_proxy_type, unionStationProxyType)
 DEFINE_SERVER_STR_CONFIG_SETTER(cmd_passenger_analytics_log_user, analyticsLogUser)
 DEFINE_SERVER_STR_CONFIG_SETTER(cmd_passenger_analytics_log_group, analyticsLogGroup)
 
@@ -298,6 +293,7 @@ DEFINE_DIR_INT_CONFIG_SETTER(cmd_passenger_max_requests, maxRequests, unsigned l
 DEFINE_DIR_THREEWAY_CONFIG_SETTER(cmd_passenger_high_performance, highPerformance)
 DEFINE_DIR_THREEWAY_CONFIG_SETTER(cmd_passenger_enabled, enabled)
 DEFINE_DIR_STR_CONFIG_SETTER(cmd_passenger_ruby, ruby)
+DEFINE_DIR_STR_CONFIG_SETTER(cmd_passenger_python, python)
 DEFINE_DIR_STR_CONFIG_SETTER(cmd_environment, environment)
 DEFINE_DIR_INT_CONFIG_SETTER(cmd_passenger_stat_throttle_rate, statThrottleRate, unsigned long, 0)
 DEFINE_DIR_STR_CONFIG_SETTER(cmd_passenger_app_root, appRoot)
@@ -373,8 +369,6 @@ cmd_rails_base_uri(cmd_parms *cmd, void *pcfg, const char *arg) {
 	}
 }
 
-DEFINE_DIR_THREEWAY_CONFIG_SETTER(cmd_rails_auto_detect, autoDetectRails)
-
 
 
 static const char *
@@ -414,14 +408,12 @@ cmd_rack_base_uri(cmd_parms *cmd, void *pcfg, const char *arg) {
 	}
 }
 
-DEFINE_DIR_THREEWAY_CONFIG_SETTER(cmd_rack_auto_detect, autoDetectRack)
-
 
 /*************************************************
  * WSGI-specific settings
  *************************************************/
 
-DEFINE_DIR_THREEWAY_CONFIG_SETTER(cmd_wsgi_auto_detect, autoDetectWSGI)
+// none
 
 
 /*************************************************
@@ -479,6 +471,11 @@ const command_rec passenger_commands[] = {
 		NULL,
 		OR_OPTIONS | ACCESS_CONF | RSRC_CONF,
 		"The Ruby interpreter to use."),
+	AP_INIT_TAKE1("PassengerPython",
+		(Take1Func) cmd_passenger_python,
+		NULL,
+		OR_OPTIONS | ACCESS_CONF | RSRC_CONF,
+		"The Python interpreter to use."),
 	AP_INIT_TAKE1("PassengerLogLevel",
 		(Take1Func) cmd_passenger_log_level,
 		NULL,
@@ -639,11 +636,6 @@ const command_rec passenger_commands[] = {
 		NULL,
 		RSRC_CONF,
 		"The address of the proxy that should be used for sending data to Union Station."),
-	AP_INIT_TAKE1("UnionStationProxyType",
-		(Take1Func) cmd_union_station_proxy_type,
-		NULL,
-		RSRC_CONF,
-		"The type of the proxy that should be used for sending data to Union Station."),
 	AP_INIT_TAKE1("PassengerAnalyticsLogUser",
 		(Take1Func) cmd_passenger_analytics_log_user,
 		NULL,
@@ -713,11 +705,6 @@ const command_rec passenger_commands[] = {
 		NULL,
 		OR_OPTIONS | ACCESS_CONF | RSRC_CONF,
 		"Reserve the given URI to a Rails application."),
-	AP_INIT_FLAG("RailsAutoDetect",
-		(FlagFunc) cmd_rails_auto_detect,
-		NULL,
-		RSRC_CONF,
-		"Whether auto-detection of Ruby on Rails applications should be enabled."),
 	AP_INIT_TAKE1("RailsEnv",
 		(Take1Func) cmd_environment,
 		NULL,
@@ -730,11 +717,6 @@ const command_rec passenger_commands[] = {
 		NULL,
 		OR_OPTIONS | ACCESS_CONF | RSRC_CONF,
 		"Reserve the given URI to a Rack application."),
-	AP_INIT_FLAG("RackAutoDetect",
-		(FlagFunc) cmd_rack_auto_detect,
-		NULL,
-		RSRC_CONF,
-		"Whether auto-detection of Rack applications should be enabled."),
 	AP_INIT_TAKE1("RackEnv",
 		(Take1Func) cmd_environment,
 		NULL,
@@ -742,11 +724,7 @@ const command_rec passenger_commands[] = {
 		"The environment under which a Rack app must run."),
 	
 	// WSGI-specific settings.
-	AP_INIT_FLAG("PassengerWSGIAutoDetect",
-		(FlagFunc) cmd_wsgi_auto_detect,
-		NULL,
-		RSRC_CONF,
-		"Whether auto-detection of WSGI applications should be enabled."),
+	// none
 	
 	// Backwards compatibility options.
 	AP_INIT_TAKE1("RailsRuby",

data/ext/apache2/Configuration.hpp

@@ -68,17 +68,11 @@ struct DirConfig {
 	std::set<std::string> railsBaseURIs;
 	std::set<std::string> rackBaseURIs;
 	
-	/** Whether to autodetect Rails applications. */
-	Threeway autoDetectRails;
-	
-	/** Whether to autodetect Rack applications. */
-	Threeway autoDetectRack;
-	
-	/** Whether to autodetect WSGI applications. */
-	Threeway autoDetectWSGI;
-
 	/** The Ruby interpreter to use. */
 	const char *ruby;
+
+	/** The Python interpreter to use. */
+	const char *python;
 	
 	/** The environment (RAILS_ENV/RACK_ENV/WSGI_ENV) under which
 	 * applications should operate. */
@@ -377,7 +371,6 @@ struct ServerConfig {
 	int unionStationGatewayPort;
 	string unionStationGatewayCert;
 	string unionStationProxyAddress;
-	string unionStationProxyType;
 	
 	/** Directory in which analytics logs should be saved. */
 	string analyticsLogUser;
@@ -399,7 +392,6 @@ struct ServerConfig {
 		unionStationGatewayPort    = DEFAULT_UNION_STATION_GATEWAY_PORT;
 		unionStationGatewayCert    = string();
 		unionStationProxyAddress   = string();
-		unionStationProxyType      = string();
 		analyticsLogUser   = DEFAULT_ANALYTICS_LOG_USER;
 		analyticsLogGroup  = DEFAULT_ANALYTICS_LOG_GROUP;
 	}
@@ -427,13 +419,6 @@ struct ServerConfig {
 			
 			defaultGroup = groupEntry->gr_name;
 		}
-		
-		if (unionStationProxyType != ""
-		 && unionStationProxyType != "http"
-		 && unionStationProxyType != "socks5") {
-			throw ConfigurationException(string("The option 'UnionStationProxyType' ") +
-				"may only be set to 'http' or 'socks5'.");
-		}
 	}
 };
 

data/ext/apache2/DirectoryMapper.h

@@ -32,8 +32,9 @@
 #include <oxt/backtrace.hpp>
 
 #include "Configuration.hpp"
-#include "Utils.h"
-#include "Utils/CachedFileStat.hpp"
+#include <ApplicationPool2/AppTypes.h>
+#include <Utils.h>
+#include <Utils/CachedFileStat.hpp>
 
 // The Apache/APR headers *must* come after the Boost headers, otherwise
 // compilation will fail on OpenBSD.
@@ -44,6 +45,7 @@ namespace Passenger {
 
 using namespace std;
 using namespace oxt;
+using namespace Passenger::ApplicationPool2;
 
 /**
  * Utility class for determining URI-to-application directory mappings.
@@ -55,14 +57,6 @@ using namespace oxt;
  * @ingroup Core
  */
 class DirectoryMapper {
-public:
-	enum ApplicationType {
-		NONE,
-		CLASSIC_RAILS,
-		RACK,
-		WSGI
-	};
-
 private:
 	DirConfig *config;
 	request_rec *r;
@@ -70,22 +64,7 @@ private:
 	unsigned int throttleRate;
 	bool baseURIKnown;
 	const char *baseURI;
-	ApplicationType appType;
-	
-	inline bool shouldAutoDetectClassicRails() {
-		return config->autoDetectRails == DirConfig::ENABLED ||
-			config->autoDetectRails == DirConfig::UNSET;
-	}
-	
-	inline bool shouldAutoDetectRack() {
-		return config->autoDetectRack == DirConfig::ENABLED ||
-			config->autoDetectRack == DirConfig::UNSET;
-	}
-	
-	inline bool shouldAutoDetectWSGI() {
-		return config->autoDetectWSGI == DirConfig::ENABLED ||
-			config->autoDetectWSGI == DirConfig::UNSET;
-	}
+	PassengerAppType appType;
 	
 public:
 	/**
@@ -102,7 +81,7 @@ public:
 		this->config = config;
 		this->cstat = cstat;
 		this->throttleRate = throttleRate;
-		appType = NONE;
+		appType = PAT_NONE;
 		baseURIKnown = false;
 		baseURI = NULL;
 	}
@@ -112,9 +91,8 @@ public:
 	 * RailsBaseURIs or RackBaseURIs. If yes, then the first matching base URI will
 	 * be returned.
 	 *
-	 * If Rails/Rack autodetection was enabled in the configuration, and the document
-	 * root seems to be a valid Rails/Rack 'public' folder, then this method will
-	 * return "/".
+	 * If the document root seems to be a valid application 'public' folder, then this
+	 * method will return "/".
 	 *
 	 * Otherwise, NULL will be returned.
 	 *
@@ -149,7 +127,7 @@ public:
 			) {
 				baseURIKnown = true;
 				baseURI = base.c_str();
-				appType = CLASSIC_RAILS;
+				appType = PAT_CLASSIC_RAILS;
 				return baseURI;
 			}
 		}
@@ -164,40 +142,21 @@ public:
 			) {
 				baseURIKnown = true;
 				baseURI = base.c_str();
-				appType = RACK;
+				appType = PAT_RACK;
 				return baseURI;
 			}
 		}
 		
 		UPDATE_TRACE_POINT();
-		if (shouldAutoDetectRack()
-		 && verifyRackDir(config->getAppRoot(ap_document_root(r)), cstat, throttleRate)) {
-			baseURIKnown = true;
-			baseURI = "/";
-			appType = RACK;
-			return baseURI;
-		}
-		
-		UPDATE_TRACE_POINT();
-		if (shouldAutoDetectClassicRails()
-		 && verifyRailsDir(config->getAppRoot(ap_document_root(r)), cstat, throttleRate)) {
-			baseURIKnown = true;
-			baseURI = "/";
-			appType = CLASSIC_RAILS;
-			return baseURI;
-		}
-		
-		UPDATE_TRACE_POINT();
-		if (shouldAutoDetectWSGI()
-		 && verifyWSGIDir(config->getAppRoot(ap_document_root(r)), cstat, throttleRate)) {
-			baseURIKnown = true;
+		baseURIKnown = true;
+		AppTypeDetector detector(cstat, throttleRate);
+		appType = detector.checkAppRoot(config->getAppRoot(ap_document_root(r)));
+		if (appType != PAT_NONE) {
 			baseURI = "/";
-			appType = WSGI;
-			return baseURI;
+		} else {
+			baseURI = NULL;
 		}
-		
-		baseURIKnown = true;
-		return NULL;
+		return baseURI;
 	}
 	
 	/**
@@ -244,7 +203,7 @@ public:
 	 *
 	 * @throws FileSystemException An error occured while examening the filesystem.
 	 */
-	ApplicationType getApplicationType() {
+	PassengerAppType getApplicationType() {
 		if (!baseURIKnown) {
 			getBaseURI();
 		}
@@ -257,20 +216,11 @@ public:
 	 *
 	 * @throws FileSystemException An error occured while examening the filesystem.
 	 */
-	const char *getApplicationTypeString() {
+	const char *getApplicationTypeName() {
 		if (!baseURIKnown) {
 			getBaseURI();
 		}
-		switch (appType) {
-		case CLASSIC_RAILS:
-			return "classic-rails";
-		case RACK:
-			return "rack";
-		case WSGI:
-			return "wsgi";
-		default:
-			return NULL;
-		};
+		return getAppTypeName(appType);
 	}
 };
 

data/ext/apache2/Hooks.cpp

@@ -956,11 +956,12 @@ private:
 		addHeader(output, "PASSENGER_APP_ROOT", appRoot);
 		addHeader(output, "PASSENGER_APP_GROUP_NAME", config->getAppGroupName(appRoot));
 		addHeader(output, "PASSENGER_RUBY", config->ruby);
+		addHeader(output, "PASSENGER_PYTHON", config->python);
 		addHeader(output, "PASSENGER_ENV", config->getEnvironment());
 		addHeader(output, "PASSENGER_SPAWN_METHOD", config->getSpawnMethodString());
 		addHeader(output, "PASSENGER_USER", config->getUser());
 		addHeader(output, "PASSENGER_GROUP", config->getGroup());
-		addHeader(output, "PASSENGER_APP_TYPE", mapper.getApplicationTypeString());
+		addHeader(output, "PASSENGER_APP_TYPE", mapper.getApplicationTypeName());
 		addHeader(output, "PASSENGER_MIN_INSTANCES",
 			apr_psprintf(r->pool, "%ld", config->getMinInstances()));
 		addHeader(output, "PASSENGER_MAX_PRELOADER_IDLE_TIME",
@@ -1273,7 +1274,6 @@ public:
 			serverConfig.unionStationGatewayPort,
 			serverConfig.unionStationGatewayCert,
 			serverConfig.unionStationProxyAddress,
-			serverConfig.unionStationProxyType,
 			serverConfig.prestartURLs);
 		
 		// Store some relevant information in the generation directory.

data/ext/common/AgentsStarter.cpp

@@ -62,7 +62,6 @@ agents_starter_start(AgentsStarter *as,
                      unsigned short unionStationGatewayPort,
                      const char *unionStationGatewayCert,
                      const char *unionStationProxyAddress,
-                     const char *unionStationProxyType,
                      const char **prestartURLs, unsigned int prestartURLsCount,
                      const AfterForkCallback afterFork,
                      void *callbackArgument,
@@ -93,7 +92,6 @@ agents_starter_start(AgentsStarter *as,
 			unionStationGatewayPort,
 			unionStationGatewayCert,
 			unionStationProxyAddress,
-			unionStationProxyType,
 			setOfprestartURLs,
 			afterForkFunctionObject);
 		return 1;