passenger 5.3.5 → 5.3.6

data/src/apache2_module/DirConfig/AutoGeneratedMergeFunction.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,16 @@ def main
 
   separator
 
+  add_code %Q{
+    #ifdef INTELLISENSE
+      // These includes do nothing, but keep IntelliSense happy.
+      #include <ap_config.h>
+      #include "../Config.h"
+    #endif
+  }
+
+  separator
+
   comment %q{
     DirConfig/AutoGeneratedMergeFunction.cpp is automatically generated from DirConfig/AutoGeneratedMergeFunction.cpp.cxxcodebuilder,
     using definitions from src/ruby_supportlib/phusion_passenger/apache2/config_options.rb.

data/src/apache2_module/DirConfig/AutoGeneratedStruct.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,6 +23,14 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
+#ifndef _PASSENGER_APACHE2_MODULE_DIR_CONFIG_AUTOGENERATED_STRUCT_H_
+#define _PASSENGER_APACHE2_MODULE_DIR_CONFIG_AUTOGENERATED_STRUCT_H_
+
+#ifdef INTELLISENSE
+	// These includes do nothing, but keep IntelliSense happy.
+	#include <ap_config.h>
+	#include "../ConfigGeneral/Common.h"
+#endif
 
 /*
  * DirConfig/AutoGeneratedStruct.h is automatically generated from DirConfig/AutoGeneratedStruct.h.cxxcodebuilder,
@@ -37,6 +45,15 @@
  *   rake src/apache2_module/DirConfig/AutoGeneratedStruct.h
  */
 
+namespace Passenger {
+namespace Apache2Module {
+
+/*
+ * Per-directory configuration information (autogenerated part).
+ *
+ * Use the getter methods to query information, because those will return
+ * the default value if the value is not specified.
+ */
 struct AutoGeneratedDirConfig {
 
 	/*
@@ -558,3 +575,8 @@ struct AutoGeneratedDirConfig {
 	}
 
 };
+
+} // namespace Apache2Module
+} // namespace Passenger
+
+#endif /* _PASSENGER_APACHE2_MODULE_DIR_CONFIG_AUTOGENERATED_STRUCT_H_ */

data/src/apache2_module/DirConfig/AutoGeneratedStruct.h.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,17 @@ require 'phusion_passenger/apache2/config_options'
 def main
   comment copyright_header_for(__FILE__), 1
 
+  add_code %Q{
+    #ifndef _PASSENGER_APACHE2_MODULE_DIR_CONFIG_AUTOGENERATED_STRUCT_H_
+    #define _PASSENGER_APACHE2_MODULE_DIR_CONFIG_AUTOGENERATED_STRUCT_H_
+
+    #ifdef INTELLISENSE
+      // These includes do nothing, but keep IntelliSense happy.
+      #include <ap_config.h>
+      #include "../ConfigGeneral/Common.h"
+    #endif
+  }
+
   separator
 
   comment %q{
@@ -47,6 +58,19 @@ def main
 
   separator
 
+  add_code %Q[
+    namespace Passenger {
+    namespace Apache2Module {
+  ]
+
+  separator
+
+  comment %Q{
+    Per-directory configuration information (autogenerated part).
+
+    Use the getter methods to query information, because those will return
+    the default value if the value is not specified.
+  }
   struct 'AutoGeneratedDirConfig' do
     definitions.each do |definition|
       separator
@@ -80,6 +104,15 @@ def main
       add_getter_function(definition)
     end
   end
+
+  separator
+
+  add_code %Q[
+    } // namespace Apache2Module
+    } // namespace Passenger
+
+    #endif /* _PASSENGER_APACHE2_MODULE_DIR_CONFIG_AUTOGENERATED_STRUCT_H_ */
+  ]
 end
 
 def filter_eligible_options(options)

data/src/apache2_module/Hooks.cpp

@@ -64,9 +64,9 @@
 #include <FileTools/FileManip.h>
 #include <FileTools/FileManip.h>
 #include <Utils.h>
-#include <Utils/IOUtils.h>
-#include <Utils/StrIntUtils.h>
-#include <Utils/SystemTime.h>
+#include <IOTools/IOUtils.h>
+#include <StrIntTools/StrIntUtils.h>
+#include <SystemTools/SystemTime.h>
 #include <Utils/HttpConstants.h>
 #include <Utils/ReleaseableScopedPointer.h>
 #include <LoggingKit/LoggingKit.h>

data/src/apache2_module/ServerConfig/AutoGeneratedStruct.h

@@ -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.
@@ -23,6 +23,15 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
+#ifndef _PASSENGER_APACHE2_MODULE_SERVER_CONFIG_AUTOGENERATED_STRUCT_H_
+#define _PASSENGER_APACHE2_MODULE_SERVER_CONFIG_AUTOGENERATED_STRUCT_H_
+
+#ifdef INTELLISENSE
+	// These includes do nothing, but keep IntelliSense happy.
+	#include <StaticString.h>
+	#include <ap_config.h>
+	#include "../ConfigGeneral/Common.h"
+#endif
 
 /*
  * ServerConfig/AutoGeneratedStruct.h is automatically generated from ServerConfig/AutoGeneratedStruct.h.cxxcodebuilder,
@@ -37,6 +46,15 @@
  *   rake src/apache2_module/ServerConfig/AutoGeneratedStruct.h
  */
 
+namespace Passenger {
+namespace Apache2Module {
+
+/*
+ * Server-wide (global, not per-virtual host) configuration information (autogenerated part).
+ *
+ * Use the getter methods to query information, because those will return
+ * the default value if the value is not specified.
+ */
 struct AutoGeneratedServerConfig {
 
 	/*
@@ -386,3 +404,8 @@ struct AutoGeneratedServerConfig {
 	}
 
 };
+
+} // namespace Apache2Module
+} // namespace Passenger
+
+#endif /* _PASSENGER_APACHE2_MODULE_SERVER_CONFIG_AUTOGENERATED_STRUCT_H_ */

data/src/apache2_module/ServerConfig/AutoGeneratedStruct.h.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.
@@ -30,6 +30,18 @@ require 'phusion_passenger/apache2/config_options'
 def main
   comment copyright_header_for(__FILE__), 1
 
+  add_code %Q{
+    #ifndef _PASSENGER_APACHE2_MODULE_SERVER_CONFIG_AUTOGENERATED_STRUCT_H_
+    #define _PASSENGER_APACHE2_MODULE_SERVER_CONFIG_AUTOGENERATED_STRUCT_H_
+
+    #ifdef INTELLISENSE
+      // These includes do nothing, but keep IntelliSense happy.
+      #include <StaticString.h>
+      #include <ap_config.h>
+      #include "../ConfigGeneral/Common.h"
+    #endif
+  }
+
   separator
 
   comment %q{
@@ -47,6 +59,20 @@ def main
 
   separator
 
+  add_code %Q[
+    namespace Passenger {
+    namespace Apache2Module {
+  ]
+
+  separator
+
+  comment %Q{
+    Server-wide (global, not per-virtual host) configuration information (autogenerated part).
+
+    Use the getter methods to query information, because those will return
+    the default value if the value is not specified.
+  }
+
   struct 'AutoGeneratedServerConfig' do
     definitions.each do |definition|
       separator
@@ -93,6 +119,15 @@ def main
       end
     end
   end
+
+  separator
+
+  add_code %Q[
+    } // namespace Apache2Module
+    } // namespace Passenger
+
+    #endif /* _PASSENGER_APACHE2_MODULE_SERVER_CONFIG_AUTOGENERATED_STRUCT_H_ */
+  ]
 end
 
 def filter_eligible_options(options)

data/src/cxx_supportlib/{Utils → Algorithms}/Hasher.cpp

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2014-2017 Phusion Holding B.V.
+ *  Copyright (c) 2014-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -26,7 +26,7 @@
 
 // Implementation is in its own file so that we can enable compiler optimizations for these functions only.
 
-#include <Utils/Hasher.h>
+#include <Algorithms/Hasher.h>
 
 namespace Passenger {
 

data/src/cxx_supportlib/{Utils → Algorithms}/Hasher.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2014-2017 Phusion Holding B.V.
+ *  Copyright (c) 2014-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -23,8 +23,8 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
-#ifndef _PASSENGER_HASHER_H_
-#define _PASSENGER_HASHER_H_
+#ifndef _PASSENGER_ALGORITHMS_HASHER_H_
+#define _PASSENGER_ALGORITHMS_HASHER_H_
 
 #include <boost/cstdint.hpp>
 
@@ -56,4 +56,4 @@ typedef JenkinsHash Hasher;
 
 } // namespace Passenger
 
-#endif /* _PASSENGER_HASHER_H_ */
+#endif /* _PASSENGER_ALGORITHMS_HASHER_H_ */

data/src/cxx_supportlib/AppTypeDetector/Detector.h

@@ -43,7 +43,7 @@
 #include <FileTools/FileManip.h>
 #include <Utils.h>
 #include <Utils/CachedFileStat.hpp>
-#include <Utils/StrIntUtils.h>
+#include <StrIntTools/StrIntUtils.h>
 
 namespace Passenger {
 namespace AppTypeDetector {

data/src/cxx_supportlib/ConfigKit/Schema.h

@@ -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.
@@ -40,7 +40,7 @@
 #include <ConfigKit/DummyTranslator.h>
 #include <ConfigKit/Utils.h>
 #include <DataStructures/StringKeyTable.h>
-#include <Utils/StrIntUtils.h>
+#include <StrIntTools/StrIntUtils.h>
 
 namespace Passenger {
 namespace ConfigKit {

data/src/cxx_supportlib/ConfigKit/Store.h

@@ -46,7 +46,7 @@
 #include <LoggingKit/Assert.h>
 #include <Exceptions.h>
 #include <DataStructures/StringKeyTable.h>
-#include <Utils/StrIntUtils.h>
+#include <StrIntTools/StrIntUtils.h>
 
 namespace Passenger {
 namespace ConfigKit {

data/src/cxx_supportlib/Constants.h

@@ -81,7 +81,7 @@
 #define PASSENGER_API_VERSION_MAJOR 0
 #define PASSENGER_API_VERSION_MINOR 3
 #define PASSENGER_DEFAULT_USER "nobody"
-#define PASSENGER_VERSION "5.3.5"
+#define PASSENGER_VERSION "5.3.6"
 #define POOL_HELPER_THREAD_STACK_SIZE 262144
 #define PROCESS_SHUTDOWN_TIMEOUT 60
 #define PROCESS_SHUTDOWN_TIMEOUT_DISPLAY "1 minute"

data/src/cxx_supportlib/{Utils → DataStructures}/HashMap.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.
@@ -24,8 +24,8 @@
  *  THE SOFTWARE.
  */
 
-#ifndef _PASSENGER_HASH_MAP_H_
-#define _PASSENGER_HASH_MAP_H_
+#ifndef _PASSENGER_DATA_STRUCTURES_HASH_MAP_H_
+#define _PASSENGER_DATA_STRUCTURES_HASH_MAP_H_
 
 /*
  * There are too many ways to include hash_map/unordered_map!
@@ -57,4 +57,4 @@
 	#define HashMap boost::unordered_map
 #endif
 
-#endif /* _PASSENGER_HASH_MAP_H_ */
+#endif /* _PASSENGER_DATA_STRUCTURES_HASH_MAP_H_ */

data/src/cxx_supportlib/DataStructures/HashedStaticString.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2014-2017 Phusion Holding B.V.
+ *  Copyright (c) 2014-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -23,14 +23,14 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
-#ifndef _PASSENGER_HASHED_STATIC_STRING_H_
-#define _PASSENGER_HASHED_STATIC_STRING_H_
+#ifndef _PASSENGER_DATA_STRUCTURES_HASHED_STATIC_STRING_H_
+#define _PASSENGER_DATA_STRUCTURES_HASHED_STATIC_STRING_H_
 
 #include <boost/cstdint.hpp>
 #include <oxt/macros.hpp>
 #include <string>
 #include <StaticString.h>
-#include <Utils/Hasher.h>
+#include <Algorithms/Hasher.h>
 
 namespace Passenger {
 
@@ -101,4 +101,4 @@ public:
 
 } // namespace Passenger
 
-#endif /* _PASSENGER_HASHED_STATIC_STRING_H_ */
+#endif /* _PASSENGER_DATA_STRUCTURES_HASHED_STATIC_STRING_H_ */

data/src/cxx_supportlib/DataStructures/LString.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2014-2017 Phusion Holding B.V.
+ *  Copyright (c) 2014-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -36,8 +36,8 @@
 #include <MemoryKit/palloc.h>
 #include <MemoryKit/mbuf.h>
 #include <StaticString.h>
-#include <Utils/StrIntUtils.h>
-#include <Utils/Hasher.h>
+#include <StrIntTools/StrIntUtils.h>
+#include <Algorithms/Hasher.h>
 
 namespace Passenger {
 

data/src/cxx_supportlib/{Utils → DataStructures}/StringMap.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2017 Phusion Holding B.V.
+ *  Copyright (c) 2011-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -23,15 +23,15 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
-#ifndef _PASSENGER_STRING_MAP_H_
-#define _PASSENGER_STRING_MAP_H_
+#ifndef _PASSENGER_DATA_STRUCTURES_STRING_MAP_H_
+#define _PASSENGER_DATA_STRUCTURES_STRING_MAP_H_
 
 #include <string>
 #include <map>
 #include <utility>
 
 #include <StaticString.h>
-#include <Utils/HashMap.h>
+#include <DataStructures/HashMap.h>
 
 namespace Passenger {
 
@@ -54,106 +54,106 @@ private:
 		string key;
 		pair<StaticString, T> thePair;
 	};
-	
+
 	typedef HashMap<StaticString, Entry, StaticString::Hash> InternalMap;
 	typedef typename InternalMap::iterator InternalIterator;
 	typedef typename InternalMap::const_iterator InternalConstIterator;
 	typedef typename InternalMap::value_type ValueType;
 	InternalMap store;
-	
+
 public:
 	class const_iterator {
 	private:
 		InternalConstIterator it;
-		
+
 	public:
 		const_iterator() { }
-		
+
 		const_iterator(const InternalConstIterator &_it)
 			: it(_it)
 			{ }
-		
+
 		const_iterator &operator=(const const_iterator &value) {
 			it = value.it;
 			return *this;
 		}
-		
+
 		const_iterator &operator++() {
 			it++;
 			return *this;
 		}
-		
+
 		const_iterator operator++(int) {
 			const_iterator copy(*this);
 			operator++();
 			return copy;
 		}
-		
+
 		bool operator==(const const_iterator &other) {
 			return it == other.it;
 		}
-		
+
 		bool operator!=(const const_iterator &other) {
 			return it != other.it;
 		}
-		
+
 		const pair<const StaticString, const T> &operator*() {
 			return (pair<const StaticString, const T> &) it->second.thePair;
 		}
-		
+
 		const pair<const StaticString, const T> *operator->() {
 			return &(**this);
 		}
 	};
-	
+
 	class iterator {
 	private:
 		InternalIterator it;
-		
+
 	public:
 		iterator() { }
-		
+
 		iterator(const InternalIterator &_it)
 			: it(_it)
 			{ }
-		
+
 		iterator &operator=(const iterator &value) {
 			it = value.it;
 			return *this;
 		}
-		
+
 		iterator &operator++() {
 			it++;
 			return *this;
 		}
-		
+
 		iterator operator++(int) {
 			iterator copy(*this);
 			operator++();
 			return copy;
 		}
-		
+
 		bool operator==(const iterator &other) {
 			return it == other.it;
 		}
-		
+
 		bool operator!=(const iterator &other) {
 			return it != other.it;
 		}
-		
+
 		pair<StaticString, T> &operator*() {
 			return it->second.thePair;
 		}
-		
+
 		pair<StaticString, T> *operator->() {
 			return &(**this);
 		}
-		
+
 		operator const_iterator() const {
 			return const_iterator(it);
 		}
 	};
-	
+
 	T get(const StaticString &key) const {
 		InternalConstIterator it = store.find(key);
 		if (it == store.end()) {
@@ -175,7 +175,7 @@ public:
 	bool has(const StaticString &key) const {
 		return store.find(key) != store.end();
 	}
-	
+
 	bool set(const StaticString &key, const T &value) {
 		pair<InternalIterator, bool> result = store.insert(make_pair(key, Entry()));
 		if (result.second) {
@@ -196,31 +196,31 @@ public:
 			return false;
 		}
 	}
-	
+
 	bool remove(const StaticString &key) {
 		return store.erase(key) > 0;
 	}
-	
+
 	unsigned int size() const {
 		return store.size();
 	}
-	
+
 	bool empty() const {
 		return store.empty();
 	}
-	
+
 	iterator begin() {
 		return iterator(store.begin());
 	}
-	
+
 	const_iterator begin() const {
 		return const_iterator(store.begin());
 	}
-	
+
 	iterator end() {
 		return iterator(store.end());
 	}
-	
+
 	const_iterator end() const {
 		return const_iterator(store.end());
 	}
@@ -229,4 +229,4 @@ public:
 
 } // namespace Passenger
 
-#endif /* _PASSENGER_STRING_MAP_H_ */
+#endif /* _PASSENGER_DATA_STRUCTURES_STRING_MAP_H_ */