passenger 5.1.12 → 5.2.0

data/src/apache2_module/ConfigGeneral/SetterFuncs.h

@@ -0,0 +1,65 @@
+/*
+ *  Phusion Passenger - https://www.phusionpassenger.com/
+ *  Copyright (c) 2017 Phusion Holding B.V.
+ *
+ *  "Passenger", "Phusion Passenger" and "Union Station" are registered
+ *  trademarks of Phusion Holding B.V.
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in
+ *  all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *  THE SOFTWARE.
+ */
+#ifndef _PASSENGER_APACHE2_MODULE_CONFIG_GENERAL_SETTER_FUNCS_H_
+#define _PASSENGER_APACHE2_MODULE_CONFIG_GENERAL_SETTER_FUNCS_H_
+
+#include <limits>
+#include <cstdlib>
+#include <http_config.h>
+
+namespace Passenger {
+namespace Apache2Module {
+
+using namespace std;
+
+
+inline const char *
+setIntConfig(cmd_parms *cmd, const char *rawValue, int &parsedValue,
+	int minValue = std::numeric_limits<int>::min())
+{
+	char *end;
+	long result;
+
+	result = strtol(rawValue, &end, 10);
+	if (*end != '\0') {
+		return apr_psprintf(cmd->temp_pool, "Invalid number specified for %s.",
+			cmd->directive->directive);
+	}
+
+	if (minValue != std::numeric_limits<int>::min() && result < (long) minValue) {
+		return apr_psprintf(cmd->temp_pool, "%s must be at least %d.",
+			cmd->directive->directive, minValue);
+	}
+
+	parsedValue = (int) result;
+	return NULL;
+}
+
+
+} // namespace Apache2Module
+} // namespace Passenger
+
+#endif /* _PASSENGER_APACHE2_MODULE_CONFIG_GENERAL_SETTER_FUNCS_H_ */

data/src/apache2_module/DirConfig/AutoGeneratedCreateFunction.cpp

@@ -0,0 +1,174 @@
+/*
+ *  Phusion Passenger - https://www.phusionpassenger.com/
+ *  Copyright (c) 2010-2017 Phusion Holding B.V.
+ *
+ *  "Passenger", "Phusion Passenger" and "Union Station" are registered
+ *  trademarks of Phusion Holding B.V.
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in
+ *  all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *  THE SOFTWARE.
+ */
+
+/*
+ * DirConfig/AutoGeneratedCreateFunction.cpp is automatically generated from DirConfig/AutoGeneratedCreateFunction.cpp.cxxcodebuilder,
+ * using definitions from src/ruby_supportlib/phusion_passenger/apache2/config_options.rb.
+ * Edits to DirConfig/AutoGeneratedCreateFunction.cpp will be lost.
+ *
+ * To update DirConfig/AutoGeneratedCreateFunction.cpp:
+ *   rake apache2
+ *
+ * To force regeneration of DirConfig/AutoGeneratedCreateFunction.cpp:
+ *   rm -f src/apache2_module/DirConfig/AutoGeneratedCreateFunction.cpp
+ *   rake src/apache2_module/DirConfig/AutoGeneratedCreateFunction.cpp
+ */
+
+namespace Passenger {
+namespace Apache2Module {
+
+static void
+createDirConfig_autoGenerated(DirConfig *config) {
+	config->mAllowEncodedSlashes = Apache2Module::UNSET;
+	/*
+	 * config->mAppEnv: default initialized
+	 */
+	/*
+	 * config->mAppGroupName: default initialized
+	 */
+	/*
+	 * config->mAppRoot: default initialized
+	 */
+	/*
+	 * config->mAppType: default initialized
+	 */
+	/*
+	 * config->mBaseURIs: default initialized
+	 */
+	config->mBufferResponse = Apache2Module::UNSET;
+	config->mBufferUpload = Apache2Module::UNSET;
+	config->mEnabled = Apache2Module::UNSET;
+	config->mErrorOverride = Apache2Module::UNSET;
+	config->mForceMaxConcurrentRequestsPerProcess = UNSET_INT_VALUE;
+	config->mFriendlyErrorPages = Apache2Module::UNSET;
+	/*
+	 * config->mGroup: default initialized
+	 */
+	config->mHighPerformance = Apache2Module::UNSET;
+	config->mLoadShellEnvvars = Apache2Module::UNSET;
+	config->mLveMinUid = UNSET_INT_VALUE;
+	config->mMaxPreloaderIdleTime = UNSET_INT_VALUE;
+	config->mMaxRequestQueueSize = UNSET_INT_VALUE;
+	config->mMaxRequests = UNSET_INT_VALUE;
+	/*
+	 * config->mMeteorAppSettings: default initialized
+	 */
+	config->mMinInstances = UNSET_INT_VALUE;
+	/*
+	 * config->mNodejs: default initialized
+	 */
+	/*
+	 * config->mPython: default initialized
+	 */
+	/*
+	 * config->mRestartDir: default initialized
+	 */
+	/*
+	 * config->mRuby: default initialized
+	 */
+	/*
+	 * config->mSpawnMethod: default initialized
+	 */
+	config->mStartTimeout = UNSET_INT_VALUE;
+	/*
+	 * config->mStartupFile: default initialized
+	 */
+	config->mStickySessions = Apache2Module::UNSET;
+	/*
+	 * config->mStickySessionsCookieName: default initialized
+	 */
+	/*
+	 * config->mUser: default initialized
+	 */
+
+	config->mAllowEncodedSlashesSourceLine = 0;
+	config->mAppEnvSourceLine = 0;
+	config->mAppGroupNameSourceLine = 0;
+	config->mAppRootSourceLine = 0;
+	config->mAppTypeSourceLine = 0;
+	config->mBaseURIsSourceLine = 0;
+	config->mBufferResponseSourceLine = 0;
+	config->mBufferUploadSourceLine = 0;
+	config->mEnabledSourceLine = 0;
+	config->mErrorOverrideSourceLine = 0;
+	config->mForceMaxConcurrentRequestsPerProcessSourceLine = 0;
+	config->mFriendlyErrorPagesSourceLine = 0;
+	config->mGroupSourceLine = 0;
+	config->mHighPerformanceSourceLine = 0;
+	config->mLoadShellEnvvarsSourceLine = 0;
+	config->mLveMinUidSourceLine = 0;
+	config->mMaxPreloaderIdleTimeSourceLine = 0;
+	config->mMaxRequestQueueSizeSourceLine = 0;
+	config->mMaxRequestsSourceLine = 0;
+	config->mMeteorAppSettingsSourceLine = 0;
+	config->mMinInstancesSourceLine = 0;
+	config->mNodejsSourceLine = 0;
+	config->mPythonSourceLine = 0;
+	config->mRestartDirSourceLine = 0;
+	config->mRubySourceLine = 0;
+	config->mSpawnMethodSourceLine = 0;
+	config->mStartTimeoutSourceLine = 0;
+	config->mStartupFileSourceLine = 0;
+	config->mStickySessionsSourceLine = 0;
+	config->mStickySessionsCookieNameSourceLine = 0;
+	config->mUserSourceLine = 0;
+
+	config->mAllowEncodedSlashesExplicitlySet = false;
+	config->mAppEnvExplicitlySet = false;
+	config->mAppGroupNameExplicitlySet = false;
+	config->mAppRootExplicitlySet = false;
+	config->mAppTypeExplicitlySet = false;
+	config->mBaseURIsExplicitlySet = false;
+	config->mBufferResponseExplicitlySet = false;
+	config->mBufferUploadExplicitlySet = false;
+	config->mEnabledExplicitlySet = false;
+	config->mErrorOverrideExplicitlySet = false;
+	config->mForceMaxConcurrentRequestsPerProcessExplicitlySet = false;
+	config->mFriendlyErrorPagesExplicitlySet = false;
+	config->mGroupExplicitlySet = false;
+	config->mHighPerformanceExplicitlySet = false;
+	config->mLoadShellEnvvarsExplicitlySet = false;
+	config->mLveMinUidExplicitlySet = false;
+	config->mMaxPreloaderIdleTimeExplicitlySet = false;
+	config->mMaxRequestQueueSizeExplicitlySet = false;
+	config->mMaxRequestsExplicitlySet = false;
+	config->mMeteorAppSettingsExplicitlySet = false;
+	config->mMinInstancesExplicitlySet = false;
+	config->mNodejsExplicitlySet = false;
+	config->mPythonExplicitlySet = false;
+	config->mRestartDirExplicitlySet = false;
+	config->mRubyExplicitlySet = false;
+	config->mSpawnMethodExplicitlySet = false;
+	config->mStartTimeoutExplicitlySet = false;
+	config->mStartupFileExplicitlySet = false;
+	config->mStickySessionsExplicitlySet = false;
+	config->mStickySessionsCookieNameExplicitlySet = false;
+	config->mUserExplicitlySet = false;
+}
+
+
+} // namespace Apache2Module
+} // namespace Passenger

data/src/apache2_module/{MergeDirConfig.cpp.cxxcodebuilder → DirConfig/AutoGeneratedCreateFunction.cpp.cxxcodebuilder}

@@ -33,64 +33,86 @@ def main
   separator
 
   comment %q{
-    MergeDirConfig.cpp is automatically generated from MergeDirConfig.cpp.cxxcodebuilder,
+    DirConfig/AutoGeneratedCreateFunction.cpp is automatically generated from DirConfig/AutoGeneratedCreateFunction.cpp.cxxcodebuilder,
     using definitions from src/ruby_supportlib/phusion_passenger/apache2/config_options.rb.
-    Edits to MergeDirConfig.cpp will be lost.
+    Edits to DirConfig/AutoGeneratedCreateFunction.cpp will be lost.
 
-    To update MergeDirConfig.cpp:
+    To update DirConfig/AutoGeneratedCreateFunction.cpp:
       rake apache2
 
-    To force regeneration of MergeDirConfig.cpp:
-      rm -f src/apache2_module/MergeDirConfig.cpp
-      rake src/apache2_module/MergeDirConfig.cpp
+    To force regeneration of DirConfig/AutoGeneratedCreateFunction.cpp:
+      rm -f src/apache2_module/DirConfig/AutoGeneratedCreateFunction.cpp
+      rake src/apache2_module/DirConfig/AutoGeneratedCreateFunction.cpp
   }
 
   separator
 
-  filter_eligible_options(APACHE2_DIRECTORY_CONFIGURATION_OPTIONS).each do |option|
-    if option[:type] == :string
-      add_code %Q{
-        config->#{struct_field_for(option)} =
-          (add->#{struct_field_for(option)} == NULL) ?
-          base->#{struct_field_for(option)} :
-          add->#{struct_field_for(option)};
-      }
-    elsif option[:type] == :integer
+  add_code %Q[
+    namespace Passenger {
+    namespace Apache2Module {
+  ]
+
+  separator
+
+  function 'static void createDirConfig_autoGenerated(DirConfig *config)' do
+    options = filter_eligible_options(APACHE2_CONFIGURATION_OPTIONS)
+
+    options.each do |option|
+      field_name = struct_field_for(option)
+      case option[:type]
+      when :integer
+        add_code("config->#{field_name} = UNSET_INT_VALUE;")
+      when :flag
+        add_code("config->#{field_name} = Apache2Module::UNSET;")
+      when :string, :string_keyval, :string_array, :string_set
+        comment("config->#{field_name}: default initialized")
+      else
+        raise "Unknown option type #{option[:type].inspect} for option #{option[:name]}"
+      end
+    end
+
+    separator
+
+    options.each do |option|
+      field_name = struct_field_for(option)
       add_code %Q{
-        config->#{struct_field_for(option)} =
-          (add->#{struct_field_for(option)} == UNSET_INT_VALUE) ?
-          base->#{struct_field_for(option)} :
-          add->#{struct_field_for(option)};
+        config->#{field_name}SourceLine = 0;
       }
-    elsif option[:type] == :flag
+    end
+
+    separator
+
+    options.each do |option|
+      field_name = struct_field_for(option)
       add_code %Q{
-        config->#{struct_field_for(option)} =
-          (add->#{struct_field_for(option)} == DirConfig::UNSET) ?
-          base->#{struct_field_for(option)} :
-          add->#{struct_field_for(option)};
+        config->#{field_name}ExplicitlySet = false;
       }
-    else
-      raise "Unknown option type #{option[:type].inspect} for option #{option[:name]}"
     end
   end
+
+  separator
+
+  add_code %Q[
+    } // namespace Apache2Module
+    } // namespace Passenger
+  ]
 end
 
 def filter_eligible_options(options)
   options.reject do |option|
     option[:alias_for] ||
-      option.fetch(:field, true).nil? ||
-      option[:field].to_s =~ /\./ ||
-      !option.fetch(:auto_generate_nginx_merge_code, true)
+      option[:obsolete] ||
+      option[:context] == :global ||
+      option.fetch(:field, true).nil?
   end
 end
 
 def struct_field_for(option)
-  if option.has_key?(:field)
+  if option.key?(:field)
     option[:field]
   else
     result = option[:name].sub(/^Passenger/, '')
-    result[0] = result[0..0].downcase
-    result
+    "m#{result}"
   end
 end
 

data/src/apache2_module/DirConfig/AutoGeneratedHeaderSerialization.cpp

@@ -0,0 +1,113 @@
+/*
+ *  Phusion Passenger - https://www.phusionpassenger.com/
+ *  Copyright (c) 2010-2017 Phusion Holding B.V.
+ *
+ *  "Passenger", "Phusion Passenger" and "Union Station" are registered
+ *  trademarks of Phusion Holding B.V.
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in
+ *  all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *  THE SOFTWARE.
+ */
+
+/*
+ * DirConfig/AutoGeneratedHeaderSerialization.cpp is automatically generated from
+ * DirConfig/AutoGeneratedHeaderSerialization.cpp.cxxcodebuilder,
+ * using definitions from src/ruby_supportlib/phusion_passenger/apache2/config_options.rb.
+ * Edits to DirConfig/AutoGeneratedHeaderSerialization.cpp will be lost.
+ *
+ * To update DirConfig/AutoGeneratedHeaderSerialization.cpp:
+ *   rake apache2
+ *
+ * To force regeneration of DirConfig/AutoGeneratedHeaderSerialization.cpp:
+ *   rm -f src/apache2_module/DirConfig/AutoGeneratedHeaderSerialization.cpp
+ *   rake src/apache2_module/DirConfig/AutoGeneratedHeaderSerialization.cpp
+ */
+
+static void
+constructRequestHeaders_autoGenerated(request_rec *r, Passenger::Apache2Module::DirConfig *config, std::string &result) {
+	using namespace Passenger;
+	using namespace Passenger::Apache2Module;
+
+	addHeader(result, StaticString("!~PASSENGER_APP_ENV",
+			sizeof("!~PASSENGER_APP_ENV") - 1),
+		config->mAppEnv);
+	addHeader(result, StaticString("!~PASSENGER_APP_GROUP_NAME",
+			sizeof("!~PASSENGER_APP_GROUP_NAME") - 1),
+		config->mAppGroupName);
+	addHeader(r, result, StaticString("!~PASSENGER_FORCE_MAX_CONCURRENT_REQUESTS_PER_PROCESS",
+			sizeof("!~PASSENGER_FORCE_MAX_CONCURRENT_REQUESTS_PER_PROCESS") - 1),
+		config->mForceMaxConcurrentRequestsPerProcess);
+	addHeader(result, StaticString("!~PASSENGER_FRIENDLY_ERROR_PAGES",
+			sizeof("!~PASSENGER_FRIENDLY_ERROR_PAGES") - 1),
+		config->mFriendlyErrorPages);
+	addHeader(result, StaticString("!~PASSENGER_GROUP",
+			sizeof("!~PASSENGER_GROUP") - 1),
+		config->mGroup);
+	addHeader(result, StaticString("!~PASSENGER_LOAD_SHELL_ENVVARS",
+			sizeof("!~PASSENGER_LOAD_SHELL_ENVVARS") - 1),
+		config->mLoadShellEnvvars);
+	addHeader(r, result, StaticString("!~PASSENGER_LVE_MIN_UID",
+			sizeof("!~PASSENGER_LVE_MIN_UID") - 1),
+		config->mLveMinUid);
+	addHeader(r, result, StaticString("!~PASSENGER_MAX_PRELOADER_IDLE_TIME",
+			sizeof("!~PASSENGER_MAX_PRELOADER_IDLE_TIME") - 1),
+		config->mMaxPreloaderIdleTime);
+	addHeader(r, result, StaticString("!~PASSENGER_MAX_REQUEST_QUEUE_SIZE",
+			sizeof("!~PASSENGER_MAX_REQUEST_QUEUE_SIZE") - 1),
+		config->mMaxRequestQueueSize);
+	addHeader(r, result, StaticString("!~PASSENGER_MAX_REQUESTS",
+			sizeof("!~PASSENGER_MAX_REQUESTS") - 1),
+		config->mMaxRequests);
+	addHeader(result, StaticString("!~PASSENGER_METEOR_APP_SETTINGS",
+			sizeof("!~PASSENGER_METEOR_APP_SETTINGS") - 1),
+		config->mMeteorAppSettings);
+	addHeader(r, result, StaticString("!~PASSENGER_MIN_PROCESSES",
+			sizeof("!~PASSENGER_MIN_PROCESSES") - 1),
+		config->mMinInstances);
+	addHeader(result, StaticString("!~PASSENGER_NODEJS",
+			sizeof("!~PASSENGER_NODEJS") - 1),
+		config->mNodejs);
+	addHeader(result, StaticString("!~PASSENGER_PYTHON",
+			sizeof("!~PASSENGER_PYTHON") - 1),
+		config->mPython);
+	addHeader(result, StaticString("!~PASSENGER_RESTART_DIR",
+			sizeof("!~PASSENGER_RESTART_DIR") - 1),
+		config->mRestartDir);
+	addHeader(result, StaticString("!~PASSENGER_RUBY",
+			sizeof("!~PASSENGER_RUBY") - 1),
+		config->mRuby.empty() ? serverConfig.defaultRuby : config->mRuby);
+	addHeader(result, StaticString("!~PASSENGER_SPAWN_METHOD",
+			sizeof("!~PASSENGER_SPAWN_METHOD") - 1),
+		config->mSpawnMethod);
+	addHeader(r, result, StaticString("!~PASSENGER_START_TIMEOUT",
+			sizeof("!~PASSENGER_START_TIMEOUT") - 1),
+		config->mStartTimeout);
+	addHeader(result, StaticString("!~PASSENGER_STARTUP_FILE",
+			sizeof("!~PASSENGER_STARTUP_FILE") - 1),
+		config->mStartupFile);
+	addHeader(result, StaticString("!~PASSENGER_STICKY_SESSIONS",
+			sizeof("!~PASSENGER_STICKY_SESSIONS") - 1),
+		config->mStickySessions);
+	addHeader(result, StaticString("!~PASSENGER_STICKY_SESSIONS_COOKIE_NAME",
+			sizeof("!~PASSENGER_STICKY_SESSIONS_COOKIE_NAME") - 1),
+		config->mStickySessionsCookieName);
+	addHeader(result, StaticString("!~PASSENGER_USER",
+			sizeof("!~PASSENGER_USER") - 1),
+		config->mUser);
+}
+