passenger 5.3.5 → 5.3.6

data/src/apache2_module/ConfigGeneral/AutoGeneratedDefinitions.cpp.cxxcodebuilder

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2017 Phusion Holding B.V.
+#  Copyright (c) 2010-2018 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.
@@ -48,23 +48,45 @@ def main
 
   separator
 
-  APACHE2_CONFIGURATION_OPTIONS.each do |option|
-    option = resolve_possible_alias(option)
-    format =
-      "%s(%s,\n" \
-      "\t(%s) %s,\n" \
-      "\tNULL,\n" \
-      "\t%s,\n" \
-      "\t%s),\n"
-    code = sprintf(format,
-      macro_for(option),
-      name_for(option),
-      function_type_for(option),
-      function_for(option),
-      definition_context_for(option),
-      description_for(option))
-    add_code(code)
+  add_code %Q[
+    #ifdef INTELLISENSE
+      // This include does nothing, but keeps IntelliSense happy.
+      #include <http_config.h>
+    #endif
+
+    namespace Passenger {
+    namespace Apache2Module {
+
+    extern "C" const command_rec passenger_commands[] = {
+  ]
+
+  indent do
+    APACHE2_CONFIGURATION_OPTIONS.each do |option|
+      option = resolve_possible_alias(option)
+      format =
+        "%s(%s,\n" \
+        "\t(%s) %s,\n" \
+        "\tNULL,\n" \
+        "\t%s,\n" \
+        "\t%s),\n"
+      code = sprintf(format,
+        macro_for(option),
+        name_for(option),
+        function_type_for(option),
+        function_for(option),
+        definition_context_for(option),
+        description_for(option))
+      add_code(code)
+    end
   end
+
+  add_code %Q[
+      { NULL }
+    };
+
+    } // namespace Apache2Module
+    } // namespace Passenger
+  ]
 end
 
 def resolve_possible_alias(option)

data/src/apache2_module/ConfigGeneral/AutoGeneratedSetterFuncs.cpp

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2017 Phusion Holding B.V.
+ *  Copyright (c) 2010-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -23,6 +23,24 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
+#ifndef _PASSENGER_APACHE2_MODULE_CONFIG_AUTOGENERATED_SETTER_FUNCS_CPP_
+#define _PASSENGER_APACHE2_MODULE_CONFIG_AUTOGENERATED_SETTER_FUNCS_CPP_
+
+#ifdef INTELLISENSE
+	// These includes do nothing, but keep IntelliSense happy.
+	#include <ap_config.h>
+	#include <http_config.h>
+	#include <http_log.h>
+	#include "../Config.h"
+
+	#ifdef APLOG_USE_MODULE
+		extern "C" module AP_MODULE_DECLARE_DATA passenger_module;
+		APLOG_USE_MODULE(passenger);
+	#endif
+#endif
+
+namespace Passenger {
+namespace Apache2Module {
 
 /*
  * ConfigGeneral/AutoGeneratedSetterFuncs.cpp is automatically generated from
@@ -972,3 +990,8 @@ cmd_union_station_support(cmd_parms *cmd, void *pcfg, const char *arg) {
 	return NULL;
 }
 
+
+} // namespace Apache2Module
+} // namespace Passenger
+
+#endif /* _PASSENGER_APACHE2_MODULE_CONFIG_AUTOGENERATED_SETTER_FUNCS_CPP_ */

data/src/apache2_module/ConfigGeneral/AutoGeneratedSetterFuncs.cpp.cxxcodebuilder

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2017 Phusion Holding B.V.
+#  Copyright (c) 2010-2018 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.
@@ -30,6 +30,27 @@ require 'phusion_passenger/apache2/config_options'
 def main
   comment copyright_header_for(__FILE__), 1
 
+  add_code %Q[
+    #ifndef _PASSENGER_APACHE2_MODULE_CONFIG_AUTOGENERATED_SETTER_FUNCS_CPP_
+    #define _PASSENGER_APACHE2_MODULE_CONFIG_AUTOGENERATED_SETTER_FUNCS_CPP_
+
+    #ifdef INTELLISENSE
+      // These includes do nothing, but keep IntelliSense happy.
+      #include <ap_config.h>
+      #include <http_config.h>
+      #include <http_log.h>
+      #include "../Config.h"
+
+      #ifdef APLOG_USE_MODULE
+        extern "C" module AP_MODULE_DECLARE_DATA passenger_module;
+        APLOG_USE_MODULE(passenger);
+      #endif
+    #endif
+
+    namespace Passenger {
+    namespace Apache2Module {
+  ]
+
   separator
 
   comment %q{
@@ -53,6 +74,15 @@ def main
       setter_function_body_for(option)
     end
   end
+
+  separator
+
+  add_code %Q[
+    } // namespace Apache2Module
+    } // namespace Passenger
+
+    #endif /* _PASSENGER_APACHE2_MODULE_CONFIG_AUTOGENERATED_SETTER_FUNCS_CPP_ */
+  ]
 end
 
 def filter_eligible_options(options)

data/src/{cxx_supportlib/Utils/MemoryBarrier.h → apache2_module/ConfigGeneral/Common.h}

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2017 Phusion Holding B.V.
+ *  Copyright (c) 2010-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -23,31 +23,23 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
-#ifndef _PASSENGER_MEMORY_BARRIER_H_
-#define _PASSENGER_MEMORY_BARRIER_H_
+#ifndef _PASSENGER_APACHE2_MODULE_CONFIG_COMMON_H_
+#define _PASSENGER_APACHE2_MODULE_CONFIG_COMMON_H_
 
-// Memory barrier macros. Also act as compiler barriers.
+namespace Passenger {
+namespace Apache2Module {
 
-#if defined(__GNUC__) || defined(__INTEL_COMPILER)
-	#if defined(__i386__)
-		#if defined(HAS_SSE2) || (defined(HAS_LFENCE) && defined(HAS_SFENCE))
-			#define P_READ_BARRIER() \
-				do { __asm__ __volatile__ ("lfence" ::: "memory"); } while (false)
-			#define P_WRITE_BARRIER() \
-				do { __asm__ __volatile__ ("sfence" ::: "memory"); } while (false)
-		#else
-			#define P_READ_BARRIER() \
-				do { __asm__ __volatile__ ("" ::: "memory"); } while (false)
-			#define P_WRITE_BARRIER() \
-				do { __asm__ __volatile__ ("lock; addl $0,0(%%esp)" ::: "memory"); } while (false)
-		#endif
 
-	#elif defined(__x86_64__)
-		#define P_READ_BARRIER() \
-			do { __asm__ __volatile__ ("lfence" ::: "memory"); } while (false)
-		#define P_WRITE_BARRIER() \
-			do { __asm__ __volatile__ ("sfence" ::: "memory"); } while (false)
-	#endif
-#endif
+enum Threeway {
+	UNSET = -1,
+	DISABLED = 0,
+	ENABLED = 1
+};
 
-#endif /* _PASSENGER_MEMORY_BARRIER_H_ */
+#define UNSET_INT_VALUE INT_MIN
+
+
+} // namespace Apache2Module
+} // namespace Passenger
+
+#endif /* _PASSENGER_APACHE2_MODULE_CONFIG_COMMON_H_ */

data/src/apache2_module/DirConfig/AutoGeneratedCreateFunction.cpp

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2017 Phusion Holding B.V.
+ *  Copyright (c) 2010-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -24,6 +24,15 @@
  *  THE SOFTWARE.
  */
 
+#ifndef _PASSENGER_APACHE2_MODULE_CONFIG_AUTOGENERATED_CREATE_FUNCTION_CPP_
+#define _PASSENGER_APACHE2_MODULE_CONFIG_AUTOGENERATED_CREATE_FUNCTION_CPP_
+
+#ifdef INTELLISENSE
+	// These includes do nothing, but keep IntelliSense happy.
+	#include <ap_config.h>
+	#include "../Config.h"
+#endif
+
 /*
  * DirConfig/AutoGeneratedCreateFunction.cpp is automatically generated from DirConfig/AutoGeneratedCreateFunction.cpp.cxxcodebuilder,
  * using definitions from src/ruby_supportlib/phusion_passenger/apache2/config_options.rb.
@@ -182,3 +191,5 @@ createDirConfig_autoGenerated(DirConfig *config) {
 
 } // namespace Apache2Module
 } // namespace Passenger
+
+#endif /* _PASSENGER_APACHE2_MODULE_CONFIG_AUTOGENERATED_CREATE_FUNCTION_CPP_ */

data/src/apache2_module/DirConfig/AutoGeneratedCreateFunction.cpp.cxxcodebuilder

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2017 Phusion Holding B.V.
+#  Copyright (c) 2010-2018 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.
@@ -32,6 +32,19 @@ def main
 
   separator
 
+  add_code %Q{
+    #ifndef _PASSENGER_APACHE2_MODULE_CONFIG_AUTOGENERATED_CREATE_FUNCTION_CPP_
+    #define _PASSENGER_APACHE2_MODULE_CONFIG_AUTOGENERATED_CREATE_FUNCTION_CPP_
+
+    #ifdef INTELLISENSE
+      // These includes do nothing, but keep IntelliSense happy.
+      #include <ap_config.h>
+      #include "../Config.h"
+    #endif
+  }
+
+  separator
+
   comment %q{
     DirConfig/AutoGeneratedCreateFunction.cpp is automatically generated from DirConfig/AutoGeneratedCreateFunction.cpp.cxxcodebuilder,
     using definitions from src/ruby_supportlib/phusion_passenger/apache2/config_options.rb.
@@ -95,6 +108,8 @@ def main
   add_code %Q[
     } // namespace Apache2Module
     } // namespace Passenger
+
+    #endif /* _PASSENGER_APACHE2_MODULE_CONFIG_AUTOGENERATED_CREATE_FUNCTION_CPP_ */
   ]
 end
 

data/src/apache2_module/DirConfig/AutoGeneratedHeaderSerialization.cpp

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2017 Phusion Holding B.V.
+ *  Copyright (c) 2010-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -23,6 +23,18 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
+#ifndef _PASSENGER_APACHE2_MODULE_AUTOGENERATED_HEADER_SERIALIZATION_CPP_
+#define _PASSENGER_APACHE2_MODULE_AUTOGENERATED_HEADER_SERIALIZATION_CPP_
+
+#ifdef INTELLISENSE
+	// These includes do nothing, but keep IntelliSense happy.
+	#include <ap_config.h>
+	#include <string>
+	#include "../Config.h"
+#endif
+
+namespace Passenger {
+namespace Apache2Module {
 
 /*
  * DirConfig/AutoGeneratedHeaderSerialization.cpp is automatically generated from
@@ -39,10 +51,7 @@
  */
 
 static void
-constructRequestHeaders_autoGenerated(request_rec *r, Passenger::Apache2Module::DirConfig *config, std::string &result) {
-	using namespace Passenger;
-	using namespace Passenger::Apache2Module;
-
+constructRequestHeaders_autoGenerated(request_rec *r, DirConfig *config, std::string &result) {
 	addHeader(result, StaticString("!~PASSENGER_APP_ENV",
 			sizeof("!~PASSENGER_APP_ENV") - 1),
 		config->mAppEnv);
@@ -114,3 +123,8 @@ constructRequestHeaders_autoGenerated(request_rec *r, Passenger::Apache2Module::
 		config->mUser);
 }
 
+
+} // namespace Apache2Module
+} // namespace Passenger
+
+#endif /* _PASSENGER_APACHE2_MODULE_AUTOGENERATED_HEADER_SERIALIZATION_CPP_ */

data/src/apache2_module/DirConfig/AutoGeneratedHeaderSerialization.cpp.cxxcodebuilder

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2017 Phusion Holding B.V.
+#  Copyright (c) 2010-2018 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.
@@ -30,6 +30,21 @@ require 'phusion_passenger/apache2/config_options'
 def main
   comment copyright_header_for(__FILE__), 1
 
+  add_code %Q[
+    #ifndef _PASSENGER_APACHE2_MODULE_AUTOGENERATED_HEADER_SERIALIZATION_CPP_
+    #define _PASSENGER_APACHE2_MODULE_AUTOGENERATED_HEADER_SERIALIZATION_CPP_
+
+    #ifdef INTELLISENSE
+      // These includes do nothing, but keep IntelliSense happy.
+      #include <ap_config.h>
+      #include <string>
+      #include "../Config.h"
+    #endif
+
+    namespace Passenger {
+    namespace Apache2Module {
+  ]
+
   separator
 
   comment %q{
@@ -48,14 +63,7 @@ def main
 
   separator
 
-  function 'static void constructRequestHeaders_autoGenerated(request_rec *r, Passenger::Apache2Module::DirConfig *config, std::string &result)' do
-    add_code %Q{
-      using namespace Passenger;
-      using namespace Passenger::Apache2Module;
-    }
-
-    separator
-
+  function 'static void constructRequestHeaders_autoGenerated(request_rec *r, DirConfig *config, std::string &result)' do
     filter_eligible_options(APACHE2_CONFIGURATION_OPTIONS).each do |option|
       if option[:type] == :string || option[:type] == :flag
         add_code %Q{
@@ -74,6 +82,15 @@ def main
       end
     end
   end
+
+  separator
+
+  add_code %Q[
+    } // namespace Apache2Module
+    } // namespace Passenger
+
+    #endif /* _PASSENGER_APACHE2_MODULE_AUTOGENERATED_HEADER_SERIALIZATION_CPP_ */
+  ]
 end
 
 def filter_eligible_options(options)

data/src/apache2_module/DirConfig/AutoGeneratedManifestGeneration.cpp

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2017 Phusion Holding B.V.
+ *  Copyright (c) 2017-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -24,6 +24,11 @@
  *  THE SOFTWARE.
  */
 
+#ifdef INTELLISENSE
+	// This include does nothing, but keeps IntelliSense happy.
+	#include <ap_config.h>
+#endif
+
 /*
  * DirConfig/AutoGeneratedManifestGeneration.cpp is automatically generated from DirConfig/AutoGeneratedManifestGeneration.cpp.cxxcodebuilder,
  * using definitions from src/ruby_supportlib/phusion_passenger/apache2/config_options.rb.

data/src/apache2_module/DirConfig/AutoGeneratedManifestGeneration.cpp.cxxcodebuilder

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2017 Phusion Holding B.V.
+#  Copyright (c) 2017-2018 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.
@@ -32,6 +32,15 @@ def main
 
   separator
 
+  add_code %Q{
+    #ifdef INTELLISENSE
+      // This include does nothing, but keeps IntelliSense happy.
+      #include <ap_config.h>
+    #endif
+  }
+
+  separator
+
   comment %q{
     DirConfig/AutoGeneratedManifestGeneration.cpp is automatically generated from DirConfig/AutoGeneratedManifestGeneration.cpp.cxxcodebuilder,
     using definitions from src/ruby_supportlib/phusion_passenger/apache2/config_options.rb.

data/src/apache2_module/DirConfig/AutoGeneratedMergeFunction.cpp

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2017 Phusion Holding B.V.
+ *  Copyright (c) 2010-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -24,6 +24,12 @@
  *  THE SOFTWARE.
  */
 
+#ifdef INTELLISENSE
+	// These includes do nothing, but keep IntelliSense happy.
+	#include <ap_config.h>
+	#include "../Config.h"
+#endif
+
 /*
  * DirConfig/AutoGeneratedMergeFunction.cpp is automatically generated from DirConfig/AutoGeneratedMergeFunction.cpp.cxxcodebuilder,
  * using definitions from src/ruby_supportlib/phusion_passenger/apache2/config_options.rb.