passenger 5.0.28 → 5.0.29

data/src/ruby_supportlib/phusion_passenger/vendor/daemon_controller/lock_file.rb

@@ -1,5 +1,5 @@
 # daemon_controller, library for robust daemon management
-# Copyright (c) 2010-2015 Phusion
+# Copyright (c) 2010-2015 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

data/src/ruby_supportlib/phusion_passenger/vendor/daemon_controller/spawn.rb

@@ -1,16 +1,16 @@
 # daemon_controller, library for robust daemon management
-# Copyright (c) 2010 Phusion
-# 
+# Copyright (c) 2010 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

data/src/ruby_supportlib/phusion_passenger/vendor/daemon_controller/version.rb

@@ -1,5 +1,5 @@
 # daemon_controller, library for robust daemon management
-# Copyright (c) 2010-2015 Phusion
+# Copyright (c) 2010-2015 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

data/src/ruby_supportlib/phusion_passenger/vendor/union_station_hooks_core/lib/union_station_hooks_core/api.rb

@@ -120,7 +120,7 @@ module UnionStationHooks
     #
     # This method should be used for logging exceptions outside the
     # request-response cycle, e.g. exceptions in threads. If you want to
-    # log a request that occurred during a request, use
+    # log an exception that occurred during a request, use
     # {RequestReporter#log_exception} instead. That method will also log
     # any related request-specific information, while this method does not.
     #
@@ -149,11 +149,11 @@ module UnionStationHooks
     #
     # This TimePoint samples monotonic time (with a fallback to wall clock
     # time) as well as CPU time, time spent in userspace and kernel space,
-    # time spent context switching, etc. The exact information contained 
+    # time spent context switching, etc. The exact information contained
     # in the object is operating system specific, hence the object is opaque.
     #
     # You should use it for the various API methods that require timing
-    # information. Those methods also accept standard Ruby `Time` objects, 
+    # information. Those methods also accept standard Ruby `Time` objects,
     # but we strongly recommended against doing this, because wall clock
     # time can jump forwards and backwards, which may create issues.
     #
@@ -171,8 +171,8 @@ module UnionStationHooks
       TimePoint.new(monotime_usec, pt.utime, pt.stime)
     end
 
-    # Returns a best-estimate delta (usec) between the wallclock and 
-    # the monotonic clock (updated every request), such that: 
+    # Returns a best-estimate delta (usec) between the wallclock and
+    # the monotonic clock (updated every request), such that:
     # time_monotic_usec = time_wallclock_usec - delta
     def get_delta_monotonic
       @mono_mutex.synchronize { @delta_monotonic }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passenger
 version: !ruby/object:Gem::Version
-  version: 5.0.28
+  version: 5.0.29
 platform: ruby
 authors:
 - Phusion - http://www.phusion.nl/
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-28 00:00:00.000000000 Z
+date: 2016-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -84,6 +84,15 @@ files:
 - build/support/cplusplus.rb
 - build/support/cxx_dependency_map.rb
 - build/support/general.rb
+- build/support/vendor/cxxcodebuilder/CxxCodeBuilder.sublime-project
+- build/support/vendor/cxxcodebuilder/Gemfile
+- build/support/vendor/cxxcodebuilder/Gemfile.lock
+- build/support/vendor/cxxcodebuilder/LICENSE.md
+- build/support/vendor/cxxcodebuilder/README.md
+- build/support/vendor/cxxcodebuilder/Rakefile
+- build/support/vendor/cxxcodebuilder/lib/cxxcodebuilder.rb
+- build/support/vendor/cxxcodebuilder/lib/cxxcodebuilder/builder.rb
+- build/support/vendor/cxxcodebuilder/lib/cxxcodebuilder/initializer_builder.rb
 - build/test_basics.rb
 - configure
 - dev/ci/inituidgid
@@ -373,21 +382,21 @@ files:
 - src/apache2_module/Configuration.h
 - src/apache2_module/Configuration.hpp
 - src/apache2_module/ConfigurationCommands.cpp
-- src/apache2_module/ConfigurationCommands.cpp.erb
+- src/apache2_module/ConfigurationCommands.cpp.cxxcodebuilder
 - src/apache2_module/ConfigurationFields.hpp
-- src/apache2_module/ConfigurationFields.hpp.erb
+- src/apache2_module/ConfigurationFields.hpp.cxxcodebuilder
 - src/apache2_module/ConfigurationSetters.cpp
-- src/apache2_module/ConfigurationSetters.cpp.erb
+- src/apache2_module/ConfigurationSetters.cpp.cxxcodebuilder
 - src/apache2_module/CreateDirConfig.cpp
-- src/apache2_module/CreateDirConfig.cpp.erb
+- src/apache2_module/CreateDirConfig.cpp.cxxcodebuilder
 - src/apache2_module/DirectoryMapper.h
 - src/apache2_module/Hooks.cpp
 - src/apache2_module/Hooks.h
 - src/apache2_module/MergeDirConfig.cpp
-- src/apache2_module/MergeDirConfig.cpp.erb
+- src/apache2_module/MergeDirConfig.cpp.cxxcodebuilder
 - src/apache2_module/README.md
 - src/apache2_module/SetHeaders.cpp
-- src/apache2_module/SetHeaders.cpp.erb
+- src/apache2_module/SetHeaders.cpp.cxxcodebuilder
 - src/apache2_module/mod_passenger.c
 - src/cxx_supportlib/Algorithms/MovingAverage.h
 - src/cxx_supportlib/AppTypes.cpp
@@ -395,7 +404,7 @@ files:
 - src/cxx_supportlib/BackgroundEventLoop.cpp
 - src/cxx_supportlib/BackgroundEventLoop.h
 - src/cxx_supportlib/Constants.h
-- src/cxx_supportlib/Constants.h.erb
+- src/cxx_supportlib/Constants.h.cxxcodebuilder
 - src/cxx_supportlib/DataStructures/HashedStaticString.h
 - src/cxx_supportlib/DataStructures/LString.cpp
 - src/cxx_supportlib/DataStructures/LString.h
@@ -3425,19 +3434,19 @@ files:
 - src/helper-scripts/rack-preloader.rb
 - src/helper-scripts/wsgi-loader.py
 - src/nginx_module/CacheLocationConfig.c
-- src/nginx_module/CacheLocationConfig.c.erb
+- src/nginx_module/CacheLocationConfig.c.cxxcodebuilder
 - src/nginx_module/Configuration.c
 - src/nginx_module/Configuration.h
 - src/nginx_module/ConfigurationCommands.c
-- src/nginx_module/ConfigurationCommands.c.erb
-- src/nginx_module/ConfigurationFields.h
-- src/nginx_module/ConfigurationFields.h.erb
+- src/nginx_module/ConfigurationCommands.c.cxxcodebuilder
 - src/nginx_module/ContentHandler.c
 - src/nginx_module/ContentHandler.h
 - src/nginx_module/CreateLocationConfig.c
-- src/nginx_module/CreateLocationConfig.c.erb
+- src/nginx_module/CreateLocationConfig.c.cxxcodebuilder
+- src/nginx_module/LocationConfig.h
+- src/nginx_module/LocationConfig.h.cxxcodebuilder
 - src/nginx_module/MergeLocationConfig.c
-- src/nginx_module/MergeLocationConfig.c.erb
+- src/nginx_module/MergeLocationConfig.c.cxxcodebuilder
 - src/nginx_module/README.md
 - src/nginx_module/StaticContentHandler.c
 - src/nginx_module/StaticContentHandler.h

data/src/apache2_module/ConfigurationCommands.cpp.erb

@@ -1,109 +0,0 @@
-/*
- *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2015 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.
- */
-
-/*
- * ConfigurationCommands.cpp is automatically generated from ConfigurationCommands.cpp.erb,
- * using definitions from src/ruby_supportlib/phusion_passenger/apache2/config_options.rb.
- * Edits to ConfigurationCommands.cpp will be lost.
- *
- * To update ConfigurationCommands.cpp:
- *   rake apache2
- *
- * To force regeneration of ConfigurationCommands.c:
- *   rm -f src/apache2_module/ConfigurationCommands.cpp
- *   rake src/apache2_module/ConfigurationCommands.cpp
- */
-
-<%
-require 'phusion_passenger/apache2/config_options'
-
-def resolve_possible_alias(option)
-	if option[:alias_for]
-		the_alias = APACHE2_DIRECTORY_CONFIGURATION_OPTIONS.find do |o|
-			o[:name] == option[:alias_for]
-		end.dup
-		the_alias[:aliased_for] = option[:name]
-		return the_alias
-	else
-		return option
-	end
-end
-
-def macro_for(option)
-	case option[:type]
-	when :string, :integer
-		return "AP_INIT_TAKE1"
-	when :flag
-		return "AP_INIT_FLAG"
-	else
-		raise "Unknown type #{option[:type].inspect} for option #{option[:name].inspect}"
-	end
-end
-
-def name_for(option)
-	return (option[:aliased_for] || option[:name]).inspect
-end
-
-def function_type_for(option)
-	case option[:type]
-	when :string, :integer
-		return "Take1Func"
-	when :flag
-		return "FlagFunc"
-	else
-		raise "Unknown type #{option[:type].inspect}"
-	end
-end
-
-def function_for(option)
-	if option[:function]
-		return option[:function]
-	else
-		function_name = option[:name].gsub(/[A-Z]/) do |letter|
-			"_" + letter[0..0].downcase
-		end
-		return "cmd#{function_name}"
-	end
-end
-
-def context_for(option)
-	context = option[:context] || ["OR_OPTIONS", "ACCESS_CONF", "RSRC_CONF"]
-	return context.join(" | ")
-end
-
-def description_for(option)
-	return option[:desc].inspect
-end
-%>
-
-<% for option in APACHE2_DIRECTORY_CONFIGURATION_OPTIONS %>
-	<% option = resolve_possible_alias(option) %>
-	<%= macro_for(option) %>(<%= name_for(option) %>,
-		(<%= function_type_for(option) %>) <%= function_for(option) %>,
-		NULL,
-		<%= context_for(option) %>,
-		<%= description_for(option) %>),
-<% end %>

data/src/apache2_module/ConfigurationFields.hpp.erb

@@ -1,98 +0,0 @@
-/*
- *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2015 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.
- */
-
-/*
- * ConfigurationFields.hpp is automatically generated from ConfigurationFields.hpp.erb,
- * using definitions from src/ruby_supportlib/phusion_passenger/apache2/config_options.rb.
- * Edits to ConfigurationFields.hpp will be lost.
- *
- * To update ConfigurationFields.hpp:
- *   rake apache2
- *
- * To force regeneration of ConfigurationFields.hpp:
- *   rm -f src/apache2_module/ConfigurationFields.hpp
- *   rake src/apache2_module/ConfigurationFields.hpp
- */
-
-struct GeneratedDirConfigPart {
-	enum Threeway { ENABLED, DISABLED, UNSET };
-<%
-require 'phusion_passenger/apache2/config_options'
-
-def filter_eligible_options(options)
-	return options.reject do |option|
-		option[:alias_for] ||
-			option.fetch(:field, true).nil? ||
-			option[:field].to_s =~ /\./
-	end
-end
-
-def struct_field_for(option)
-	if option.has_key?(:field)
-		return option[:field]
-	else
-		result = option[:name].sub(/^Passenger/, '')
-		result[0] = result[0..0].downcase
-		return result
-	end
-end
-
-# Returns [definition_source, estimated_size_on_x86_64, description]
-def definition_for(option)
-	field = struct_field_for(option)
-	case option[:type]
-	when :string
-		result = ["const char *#{field}", 8 + 4, field, option[:desc]]
-	when :integer
-		result = ["int #{field}", 4, field, option[:desc]]
-	when :flag
-		result = ["Threeway #{field}", 1, field, option[:desc]]
-	else
-		raise "Unknown option type #{option[:type].inspect} for option #{option[:name]}"
-	end
-	return result + [option[:desc]]
-end
-
-eligible_options = filter_eligible_options(APACHE2_DIRECTORY_CONFIGURATION_OPTIONS)
-definitions = eligible_options.map { |o| definition_for(o) }
-# Sort the definitions by size in order to make the struct smaller.
-# It's possible to make it even smaller with a smarter algorithm but for now
-# I don't bother.
-definitions.sort! do |d1, d2|
-	if d1[1] == d2[1]
-		# After sorting on size, sort alphabetically.
-		d1[2] <=> d2[2]
-	else
-		d1[1] <=> d2[1]
-	end
-end
-%>
-
-<% for definition in definitions -%>
-	/** <%= definition[3] %> */
-	<%= definition[0] %>;
-<% end %>
-};

data/src/apache2_module/ConfigurationSetters.cpp.erb

@@ -1,128 +0,0 @@
-/*
- *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2015 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.
- */
-
-/*
- * ConfigurationSetters.cpp is automatically generated from ConfigurationSetters.cpp.erb,
- * using definitions from src/ruby_supportlib/phusion_passenger/apache2/config_options.rb.
- * Edits to ConfigurationSetters.cpp will be lost.
- *
- * To update ConfigurationSetters.cpp:
- *   rake apache2
- *
- * To force regeneration of ConfigurationSetters.cpp:
- *   rm -f src/apache2_module/ConfigurationSetters.cpp
- *   rake src/apache2_module/ConfigurationSetters.cpp
- */
-
-<%
-require 'phusion_passenger/apache2/config_options'
-
-def filter_eligible_options(options)
-	return options.reject do |option|
-		option[:alias_for] ||
-			option.fetch(:field, true).nil? ||
-			option[:field].to_s =~ /\./ ||
-			option[:function]
-	end
-end
-
-def struct_field_for(option)
-	if option.has_key?(:field)
-		return option[:field]
-	else
-		result = option[:name].sub(/^Passenger/, '')
-		result[0] = result[0..0].downcase
-		return result
-	end
-end
-
-def min_value_for(option)
-	return option[:min_value] || 0
-end
-
-def function_for(option)
-	function_name = option[:name].gsub(/[A-Z]/) do |letter|
-		"_" + letter[0..0].downcase
-	end
-	return "cmd#{function_name}"
-end
-%>
-
-<% for option in filter_eligible_options(APACHE2_DIRECTORY_CONFIGURATION_OPTIONS) -%>
-	<% if option[:type] == :string %>
-		static const char *
-		<%= function_for(option) %>(cmd_parms *cmd, void *pcfg, const char *arg) {
-			DirConfig *config = (DirConfig *) pcfg;
-			config-><%= struct_field_for(option) %> = arg;
-			return NULL;
-		}
-	<% elsif option[:type] == :integer %>
-		static const char *
-		<%= function_for(option) %>(cmd_parms *cmd, void *pcfg, const char *arg) {
-			DirConfig *config = (DirConfig *) pcfg;
-			char *end;
-			long result;
-
-			result = strtol(arg, &end, 10);
-			if (*end != '\0') {
-				string message = "Invalid number specified for ";
-				message.append(cmd->directive->directive);
-				message.append(".");
-
-				char *messageStr = (char *) apr_palloc(cmd->temp_pool,
-					message.size() + 1);
-				memcpy(messageStr, message.c_str(), message.size() + 1);
-				return messageStr;
-			<% if option[:min_value] %>
-				} else if (result < <%= option[:min_value] %>) {
-					string message = "Value for ";
-					message.append(cmd->directive->directive);
-					message.append(" must be greater than or equal to <%= option[:min_value] %>.");
-
-					char *messageStr = (char *) apr_palloc(cmd->temp_pool,
-						message.size() + 1);
-					memcpy(messageStr, message.c_str(), message.size() + 1);
-					return messageStr;
-			<% end %>
-			} else {
-				config-><%= struct_field_for(option) %> = (int) result;
-				return NULL;
-			}
-		}
-	<% elsif option[:type] == :flag %>
-		static const char *
-		<%= function_for(option) %>(cmd_parms *cmd, void *pcfg, const char *arg) {
-			DirConfig *config = (DirConfig *) pcfg;
-			config-><%= struct_field_for(option) %> =
-				arg ?
-				DirConfig::ENABLED :
-				DirConfig::DISABLED;
-			return NULL;
-		}
-	<% else
-		raise "Unknown option type #{option[:type].inspect} for option #{option[:name]}"
-	end %>
-<% end %>