passenger 6.0.8 → 6.0.20

data/src/apache2_module/ConfigGeneral/AutoGeneratedManifestDefaultsInitialization.cpp

@@ -234,6 +234,11 @@ ConfigManifestGenerator::autoGenerated_setAppConfigDefaults() {
 		"PassengerNodejs",
 		DEFAULT_NODEJS);
 
+	addOptionsContainerStaticDefaultBool(
+		defaultAppConfigContainer,
+		"PassengerPreloadBundler",
+		false);
+
 	addOptionsContainerStaticDefaultStr(
 		defaultAppConfigContainer,
 		"PassengerPython",

data/src/apache2_module/ConfigGeneral/AutoGeneratedSetterFuncs.cpp

@@ -729,6 +729,24 @@ cmd_passenger_pre_start(cmd_parms *cmd, void *pcfg, const char *arg) {
 	return NULL;
 }
 
+static const char *
+cmd_passenger_preload_bundler(cmd_parms *cmd, void *pcfg, const char *arg) {
+	const char *err = ap_check_cmd_context(cmd, NOT_IN_FILES);
+	if (err != NULL) {
+		return err;
+	}
+
+	DirConfig *config = (DirConfig *) pcfg;
+	config->mPreloadBundlerSourceFile = cmd->directive->filename;
+	config->mPreloadBundlerSourceLine = cmd->directive->line_num;
+	config->mPreloadBundlerExplicitlySet = true;
+	config->mPreloadBundler =
+		(arg != NULL) ?
+		ENABLED :
+		DISABLED;
+	return NULL;
+}
+
 static const char *
 cmd_passenger_python(cmd_parms *cmd, void *pcfg, const char *arg) {
 	const char *err = ap_check_cmd_context(cmd, NOT_IN_FILES);
@@ -992,7 +1010,7 @@ cmd_passenger_user_switching(cmd_parms *cmd, void *pcfg, const char *arg) {
 
 static const char *
 cmd_rails_allow_mod_rewrite(cmd_parms *cmd, void *pcfg, const char *arg) {
-	fprintf(stderr, "WARNING: The 'RailsAllowModRewrite' option is obsolete: Phusion Passenger now fully supports mod_rewrite. Please remove this option from your configuration file.\n");
+	fprintf(stderr, "WARNING: The 'RailsAllowModRewrite' option is obsolete: Phusion Passenger(R) now fully supports mod_rewrite. Please remove this option from your configuration file.\n");
 	fflush(stderr);
 	return NULL;
 }

data/src/apache2_module/DirConfig/AutoGeneratedCreateFunction.cpp

@@ -101,6 +101,7 @@ createDirConfig_autoGenerated(DirConfig *config) {
 	/*
 	 * config->mNodejs: default initialized
 	 */
+	config->mPreloadBundler = Apache2Module::UNSET;
 	/*
 	 * config->mPython: default initialized
 	 */
@@ -154,6 +155,7 @@ createDirConfig_autoGenerated(DirConfig *config) {
 	config->mMinInstancesSourceLine = 0;
 	config->mMonitorLogFileSourceLine = 0;
 	config->mNodejsSourceLine = 0;
+	config->mPreloadBundlerSourceLine = 0;
 	config->mPythonSourceLine = 0;
 	config->mRestartDirSourceLine = 0;
 	config->mRubySourceLine = 0;
@@ -191,6 +193,7 @@ createDirConfig_autoGenerated(DirConfig *config) {
 	config->mMinInstancesExplicitlySet = false;
 	config->mMonitorLogFileExplicitlySet = false;
 	config->mNodejsExplicitlySet = false;
+	config->mPreloadBundlerExplicitlySet = false;
 	config->mPythonExplicitlySet = false;
 	config->mRestartDirExplicitlySet = false;
 	config->mRubyExplicitlySet = false;

data/src/apache2_module/DirConfig/AutoGeneratedHeaderSerialization.cpp

@@ -97,6 +97,9 @@ constructRequestHeaders_autoGenerated(request_rec *r, DirConfig *config, std::st
 	addHeader(result, StaticString("!~PASSENGER_NODEJS",
 			sizeof("!~PASSENGER_NODEJS") - 1),
 		config->mNodejs);
+	addHeader(result, StaticString("!~PASSENGER_PRELOAD_BUNDLER",
+			sizeof("!~PASSENGER_PRELOAD_BUNDLER") - 1),
+		config->mPreloadBundler);
 	addHeader(result, StaticString("!~PASSENGER_PYTHON",
 			sizeof("!~PASSENGER_PYTHON") - 1),
 		config->mPython);

data/src/apache2_module/DirConfig/AutoGeneratedManifestGeneration.cpp

@@ -361,6 +361,17 @@ ConfigManifestGenerator::autoGenerated_generateConfigManifestForDirConfig(server
 			pdconf->mNodejs.data(),
 			pdconf->mNodejs.data() + pdconf->mNodejs.size());
 	}
+	if (pdconf->mPreloadBundlerExplicitlySet) {
+		findOrCreateAppAndLocOptionsContainers(serverRec, csconf, cdconf,
+			pdconf, context, &appOptionsContainer, &locOptionsContainer);
+		Json::Value &optionContainer = findOrCreateOptionContainer(*appOptionsContainer,
+			"PassengerPreloadBundler",
+			sizeof("PassengerPreloadBundler") - 1);
+		Json::Value &hierarchyMember = addOptionContainerHierarchyMember(optionContainer,
+			pdconf->mPreloadBundlerSourceFile,
+			pdconf->mPreloadBundlerSourceLine);
+		hierarchyMember["value"] = pdconf->mPreloadBundler == Apache2Module::ENABLED;
+	}
 	if (pdconf->mPythonExplicitlySet) {
 		findOrCreateAppAndLocOptionsContainers(serverRec, csconf, cdconf,
 			pdconf, context, &appOptionsContainer, &locOptionsContainer);

data/src/apache2_module/DirConfig/AutoGeneratedMergeFunction.cpp

@@ -152,6 +152,10 @@ mergeDirConfig_autoGenerated(DirConfig *config, DirConfig *base, DirConfig *add)
 		(!add->mNodejs.empty())
 		? add->mNodejs
 		: base->mNodejs;
+	config->mPreloadBundler =
+		(add->mPreloadBundler != Apache2Module::UNSET)
+		? add->mPreloadBundler
+		: base->mPreloadBundler;
 	config->mPython =
 		(!add->mPython.empty())
 		? add->mPython
@@ -219,6 +223,7 @@ mergeDirConfig_autoGenerated(DirConfig *config, DirConfig *base, DirConfig *add)
 	config->mMinInstancesSourceFile = add->mMinInstancesSourceFile;
 	config->mMonitorLogFileSourceFile = add->mMonitorLogFileSourceFile;
 	config->mNodejsSourceFile = add->mNodejsSourceFile;
+	config->mPreloadBundlerSourceFile = add->mPreloadBundlerSourceFile;
 	config->mPythonSourceFile = add->mPythonSourceFile;
 	config->mRestartDirSourceFile = add->mRestartDirSourceFile;
 	config->mRubySourceFile = add->mRubySourceFile;
@@ -256,6 +261,7 @@ mergeDirConfig_autoGenerated(DirConfig *config, DirConfig *base, DirConfig *add)
 	config->mMinInstancesSourceLine = add->mMinInstancesSourceLine;
 	config->mMonitorLogFileSourceLine = add->mMonitorLogFileSourceLine;
 	config->mNodejsSourceLine = add->mNodejsSourceLine;
+	config->mPreloadBundlerSourceLine = add->mPreloadBundlerSourceLine;
 	config->mPythonSourceLine = add->mPythonSourceLine;
 	config->mRestartDirSourceLine = add->mRestartDirSourceLine;
 	config->mRubySourceLine = add->mRubySourceLine;
@@ -293,6 +299,7 @@ mergeDirConfig_autoGenerated(DirConfig *config, DirConfig *base, DirConfig *add)
 	config->mMinInstancesExplicitlySet = add->mMinInstancesExplicitlySet;
 	config->mMonitorLogFileExplicitlySet = add->mMonitorLogFileExplicitlySet;
 	config->mNodejsExplicitlySet = add->mNodejsExplicitlySet;
+	config->mPreloadBundlerExplicitlySet = add->mPreloadBundlerExplicitlySet;
 	config->mPythonExplicitlySet = add->mPythonExplicitlySet;
 	config->mRestartDirExplicitlySet = add->mRestartDirExplicitlySet;
 	config->mRubyExplicitlySet = add->mRubyExplicitlySet;

data/src/apache2_module/DirConfig/AutoGeneratedStruct.h

@@ -72,7 +72,7 @@ struct AutoGeneratedDirConfig {
 	Threeway mBufferUpload;
 
 	/*
-	 * Enable or disable Phusion Passenger.
+	 * Enable or disable Phusion Passenger(R).
 	 */
 	Threeway mEnabled;
 
@@ -96,6 +96,11 @@ struct AutoGeneratedDirConfig {
 	 */
 	Threeway mLoadShellEnvvars;
 
+	/*
+	 * Whether to tell Ruby to load the bundler gem before running the application.
+	 */
+	Threeway mPreloadBundler;
+
 	/*
 	 * Whether to enable sticky sessions.
 	 */
@@ -192,7 +197,7 @@ struct AutoGeneratedDirConfig {
 	StaticString mPython;
 
 	/*
-	 * The directory in which Phusion Passenger should look for restart.txt.
+	 * The directory in which Phusion Passenger(R) should look for restart.txt.
 	 */
 	StaticString mRestartDir;
 
@@ -245,6 +250,7 @@ struct AutoGeneratedDirConfig {
 	StaticString mFriendlyErrorPagesSourceFile;
 	StaticString mHighPerformanceSourceFile;
 	StaticString mLoadShellEnvvarsSourceFile;
+	StaticString mPreloadBundlerSourceFile;
 	StaticString mStickySessionsSourceFile;
 	StaticString mForceMaxConcurrentRequestsPerProcessSourceFile;
 	StaticString mLveMinUidSourceFile;
@@ -282,6 +288,7 @@ struct AutoGeneratedDirConfig {
 	unsigned int mFriendlyErrorPagesSourceLine;
 	unsigned int mHighPerformanceSourceLine;
 	unsigned int mLoadShellEnvvarsSourceLine;
+	unsigned int mPreloadBundlerSourceLine;
 	unsigned int mStickySessionsSourceLine;
 	unsigned int mForceMaxConcurrentRequestsPerProcessSourceLine;
 	unsigned int mLveMinUidSourceLine;
@@ -319,6 +326,7 @@ struct AutoGeneratedDirConfig {
 	bool mFriendlyErrorPagesExplicitlySet: 1;
 	bool mHighPerformanceExplicitlySet: 1;
 	bool mLoadShellEnvvarsExplicitlySet: 1;
+	bool mPreloadBundlerExplicitlySet: 1;
 	bool mStickySessionsExplicitlySet: 1;
 	bool mForceMaxConcurrentRequestsPerProcessExplicitlySet: 1;
 	bool mLveMinUidExplicitlySet: 1;
@@ -417,6 +425,15 @@ struct AutoGeneratedDirConfig {
 		}
 	}
 
+	bool
+	getPreloadBundler() const {
+		if (mPreloadBundler == Apache2Module::UNSET) {
+			return false;
+		} else {
+			return mPreloadBundler == Apache2Module::ENABLED;
+		}
+	}
+
 	bool
 	getStickySessions() const {
 		if (mStickySessions == Apache2Module::UNSET) {

data/src/apache2_module/Hooks.cpp

@@ -1333,6 +1333,7 @@ public:
 		config["server_software"] = webServerDesc;
 		config["multi_app"] = true;
 		config["default_load_shell_envvars"] = true;
+		config["default_preload_bundler"] = false;
 		config["config_manifest"] = serverConfig.manifest;
 		config["file_descriptor_log_target"] = nonEmptyString(serverConfig.fileDescriptorLogFile);
 		config["controller_socket_backlog"] = serverConfig.socketBacklog;

data/src/apache2_module/ServerConfig/AutoGeneratedStruct.h

@@ -58,7 +58,7 @@ namespace Apache2Module {
 struct AutoGeneratedServerConfig {
 
 	/*
-	 * Whether to disable Phusion Passenger anonymous telemetry.
+	 * Whether to disable Phusion Passenger(R) anonymous telemetry.
 	 */
 	bool disableAnonymousTelemetry;
 
@@ -68,27 +68,27 @@ struct AutoGeneratedServerConfig {
 	bool disableLogPrefix;
 
 	/*
-	 * Whether to disable the Phusion Passenger security update check & notification.
+	 * Whether to disable the Phusion Passenger(R) security update check & notification.
 	 */
 	bool disableSecurityUpdateCheck;
 
 	/*
-	 * Whether to show the Phusion Passenger version number in the X-Powered-By header.
+	 * Whether to show the Phusion Passenger(R) version number in the X-Powered-By header.
 	 */
 	bool showVersionInHeader;
 
 	/*
-	 * Whether to enable turbocaching in Phusion Passenger.
+	 * Whether to enable turbocaching in Phusion Passenger(R).
 	 */
 	bool turbocaching;
 
 	/*
-	 * Whether to enable user switching support in Phusion Passenger.
+	 * Whether to enable user switching support in Phusion Passenger(R).
 	 */
 	bool userSwitching;
 
 	/*
-	 * The Phusion Passenger log verbosity.
+	 * The Phusion Passenger(R) log verbosity.
 	 */
 	int logLevel;
 
@@ -108,12 +108,12 @@ struct AutoGeneratedServerConfig {
 	int poolIdleTime;
 
 	/*
-	 * The maximum size of the Phusion Passenger response buffer.
+	 * The maximum size of the Phusion Passenger(R) response buffer.
 	 */
 	int responseBufferHighWatermark;
 
 	/*
-	 * The Phusion Passenger socket backlog.
+	 * The Phusion Passenger(R) socket backlog.
 	 */
 	int socketBacklog;
 
@@ -143,27 +143,27 @@ struct AutoGeneratedServerConfig {
 	StaticString adminPanelUsername;
 
 	/*
-	 * Use specified HTTP/SOCKS proxy for Phusion Passenger anonymous telemetry collection.
+	 * Use specified HTTP/SOCKS proxy for Phusion Passenger(R) anonymous telemetry collection.
 	 */
 	StaticString anonymousTelemetryProxy;
 
 	/*
-	 * The directory that Phusion Passenger data buffers should be stored into.
+	 * The directory that Phusion Passenger(R) data buffers should be stored into.
 	 */
 	StaticString dataBufferDir;
 
 	/*
-	 * The group that Phusion Passenger applications must run as when user switching fails or is disabled.
+	 * The group that Phusion Passenger(R) applications must run as when user switching fails or is disabled.
 	 */
 	StaticString defaultGroup;
 
 	/*
-	 * Phusion Passenger's default Ruby interpreter to use.
+	 * Phusion Passenger(R)'s default Ruby interpreter to use.
 	 */
 	StaticString defaultRuby;
 
 	/*
-	 * The user that Phusion Passenger applications must run as when user switching fails or is disabled.
+	 * The user that Phusion Passenger(R) applications must run as when user switching fails or is disabled.
 	 */
 	StaticString defaultUser;
 
@@ -173,32 +173,32 @@ struct AutoGeneratedServerConfig {
 	StaticString dumpConfigManifest;
 
 	/*
-	 * The Phusion Passenger file descriptor log file.
+	 * The Phusion Passenger(R) file descriptor log file.
 	 */
 	StaticString fileDescriptorLogFile;
 
 	/*
-	 * The directory to register the Phusion Passenger instance to.
+	 * The directory to register the Phusion Passenger(R) instance to.
 	 */
 	StaticString instanceRegistryDir;
 
 	/*
-	 * The Phusion Passenger log file.
+	 * The Phusion Passenger(R) log file.
 	 */
 	StaticString logFile;
 
 	/*
-	 * The Phusion Passenger root folder.
+	 * The Phusion Passenger(R) root folder.
 	 */
 	StaticString root;
 
 	/*
-	 * Use specified HTTP/SOCKS proxy for the Phusion Passenger security update check.
+	 * Use specified HTTP/SOCKS proxy for the Phusion Passenger(R) security update check.
 	 */
 	StaticString securityUpdateCheckProxy;
 
 	/*
-	 * The directory for Phusion Passenger used during child spawning.
+	 * The directory for Phusion Passenger(R) used during child spawning.
 	 */
 	StaticString spawnDir;
 

data/src/cxx_supportlib/BackgroundEventLoop.cpp

@@ -269,11 +269,15 @@ BackgroundEventLoop::BackgroundEventLoop(bool scalable, bool usesLibuv)
 		throw RuntimeException("Cannot create a libev event loop");
 	}
 
+	#ifdef USE_VENDORED_LIBEV
 	P_LOG_FILE_DESCRIPTOR_OPEN2(ev_backend_fd(libev_loop), "libev event loop: backend FD");
+	#endif
 
 	ev_async_init(&priv->exitSignaller, signalLibevExit);
+	#ifdef USE_VENDORED_LIBEV
 	P_LOG_FILE_DESCRIPTOR_OPEN2(ev_loop_get_pipe(libev_loop, 0), "libev event loop: async pipe 0");
 	P_LOG_FILE_DESCRIPTOR_OPEN2(ev_loop_get_pipe(libev_loop, 1), "libev event loop: async pipe 1");
+	#endif
 	priv->exitSignaller.data = this;
 	safe = boost::make_shared<SafeLibev>(libev_loop);
 

data/src/cxx_supportlib/Constants.h

@@ -83,7 +83,7 @@
 #define PASSENGER_API_VERSION_MAJOR 0
 #define PASSENGER_API_VERSION_MINOR 3
 #define PASSENGER_DEFAULT_USER "nobody"
-#define PASSENGER_VERSION "6.0.8"
+#define PASSENGER_VERSION "6.0.20"
 #define POOL_HELPER_THREAD_STACK_SIZE 262144
 #define PROCESS_SHUTDOWN_TIMEOUT 60
 #define PROCESS_SHUTDOWN_TIMEOUT_DISPLAY "1 minute"

data/src/cxx_supportlib/DataStructures/HashedStaticString.h

@@ -53,6 +53,8 @@ public:
 		rehash();
 	}
 
+	HashedStaticString& operator=(const HashedStaticString &other) = default;
+
 	HashedStaticString(const HashedStaticString &b)
 		: StaticString(b),
 		  m_hash(b.m_hash)

data/src/cxx_supportlib/FileDescriptor.h

@@ -121,6 +121,14 @@ public:
 	 */
 	FileDescriptor() { }
 
+	/**
+	 * Creates a new FileDescriptor instance that is equal
+	 * to the passed file descriptor.
+	 *
+	 * @post *this == *other
+	 */
+	FileDescriptor(const FileDescriptor &other) = default;
+
 	/**
 	 * Creates a new FileDescriptor instance with the given fd as a handle.
 	 *

data/src/cxx_supportlib/IOTools/IOUtils.cpp

@@ -1183,7 +1183,7 @@ readFileDescriptor(int fd, unsigned long long *timeout) {
 	struct msghdr msg;
 	struct iovec vec;
 	char dummy[1];
-	#if defined(__APPLE__) || defined(__SOLARIS__) || defined(__arm__)
+	#if defined(__APPLE__) || defined(__SOLARIS__)
 		// File descriptor passing macros (CMSG_*) seem to be broken
 		// on 64-bit MacOS X. This structure works around the problem.
 		struct {
@@ -1226,7 +1226,7 @@ readFileDescriptor(int fd, unsigned long long *timeout) {
 		throw IOException("No valid file descriptor received.");
 	}
 
-	#if defined(__APPLE__) || defined(__SOLARIS__) || defined(__arm__)
+	#if defined(__APPLE__) || defined(__SOLARIS__)
 		return control_data.fd;
 	#else
 		return *((int *) CMSG_DATA(control_header));
@@ -1242,7 +1242,7 @@ writeFileDescriptor(int fd, int fdToSend, unsigned long long *timeout) {
 	struct msghdr msg;
 	struct iovec vec;
 	char dummy[1];
-	#if defined(__APPLE__) || defined(__SOLARIS__) || defined(__arm__)
+	#if defined(__APPLE__) || defined(__SOLARIS__)
 		struct {
 			struct cmsghdr header;
 			int fd;
@@ -1273,7 +1273,7 @@ writeFileDescriptor(int fd, int fdToSend, unsigned long long *timeout) {
 	control_header = CMSG_FIRSTHDR(&msg);
 	control_header->cmsg_level = SOL_SOCKET;
 	control_header->cmsg_type  = SCM_RIGHTS;
-	#if defined(__APPLE__) || defined(__SOLARIS__) || defined(__arm__)
+	#if defined(__APPLE__) || defined(__SOLARIS__)
 		control_header->cmsg_len = sizeof(control_data);
 		control_data.fd = fdToSend;
 	#else

data/src/cxx_supportlib/LoggingKit/Context.h

@@ -78,7 +78,7 @@ private:
 	mutable boost::mutex gcSyncher;
 	oxt::thread *gcThread;
 	boost::condition_variable gcShuttingDownCond, gcHasShutDownCond;
-	queue< pair<ConfigRealization *, MonotonicTimeUsec> > oldConfigs;
+	std::queue< pair<ConfigRealization *, MonotonicTimeUsec> > oldConfigs;
 	bool shuttingDown;
 
 	struct TimestampedLog {

data/src/cxx_supportlib/SafeLibev.h

@@ -147,9 +147,11 @@ public:
 
 	~SafeLibev() {
 		destroy();
+		#ifdef USE_VENDORED_LIBEV
 		P_LOG_FILE_DESCRIPTOR_CLOSE(ev_loop_get_pipe(loop, 0));
 		P_LOG_FILE_DESCRIPTOR_CLOSE(ev_loop_get_pipe(loop, 1));
 		P_LOG_FILE_DESCRIPTOR_CLOSE(ev_backend_fd(loop));
+		#endif
 		ev_loop_destroy(loop);
 	}
 

data/src/cxx_supportlib/ServerKit/HttpHeaderParser.h

@@ -489,6 +489,9 @@ public:
 					goto default_error;
 				}
 				break;
+			case HPE_UNEXPECTED_CONTENT_LENGTH:
+				message->aux.parseError = REQUEST_CONTAINS_CONTENT_LENGTH_AND_TRANSFER_ENCODING;
+				break;
 			default:
 				default_error:
 				message->aux.parseError = HTTP_PARSER_ERRNO_BEGIN - HTTP_PARSER_ERRNO(&state->parser);