passenger 4.0.48 → 4.0.49

data/lib/phusion_passenger/platform_info/compiler.rb

@@ -145,7 +145,7 @@ public
 		return string_env('CC', default_cc)
 	end
 	memoize :cc
-	
+
 	def self.cxx
 		return string_env('CXX', default_cxx)
 	end
@@ -203,7 +203,7 @@ public
 	memoize :cc_is_sun_studio?
 
 	def self.cxx_is_sun_studio?
-		`#{cxx} -V 2>&1` =~ /Sun C/ || `#{cc} -flags 2>&1` =~ /Sun C/
+		`#{cxx} -V 2>&1` =~ /Sun C/ || `#{cxx} -flags 2>&1` =~ /Sun C/
 	end
 	memoize :cxx_is_sun_studio?
 
@@ -271,7 +271,7 @@ public
 			return result && result[:result] && result[:output] !~ /unknown warning option/i
 		end
 	end
-	
+
 	def self.try_link(description, language, source, flags = nil)
 		extension = detect_language_extension(language)
 		create_temp_file("passenger-link-check.#{extension}") do |filename, f|
@@ -283,7 +283,7 @@ public
 			return run_compiler(description, command, filename, source)
 		end
 	end
-	
+
 	def self.try_compile_and_run(description, language, source, flags = nil)
 		extension = detect_language_extension(language)
 		create_temp_file("passenger-run-check.#{extension}", tmpexedir) do |filename, f|
@@ -315,7 +315,7 @@ public
 		return try_compile("Checking for C compiler '-arch' support",
 			:c, '', "-arch #{arch}")
 	end
-	
+
 	def self.cc_supports_visibility_flag?
 		return false if os_name =~ /aix/
 		return try_compile("Checking for C compiler '-fvisibility' support",
@@ -329,7 +329,7 @@ public
 			:cxx, '', '-fvisibility=hidden')
 	end
 	memoize :cxx_supports_visibility_flag?, true
-	
+
 	def self.cc_supports_wno_attributes_flag?
 		return try_compile_with_warning_flag(
 			"Checking for C compiler '-Wno-attributes' support",
@@ -442,7 +442,7 @@ public
 		end
 	end
 	memoize :cxx_visibility_flag_generates_warnings?, true
-	
+
 	def self.adress_sanitizer_flag
 		if cc_is_clang?
 			if `#{cc} --help` =~ /-fsanitize=/
@@ -487,7 +487,7 @@ public
 			:c, "int main() { return 0; }\n", '-lmath')
 	end
 	memoize :has_math_library?, true
-	
+
 	def self.has_alloca_h?
 		return try_compile("Checking for alloca.h",
 			:c, '#include <alloca.h>')
@@ -502,7 +502,7 @@ public
 		})
 	end
 	memoize :has_accept4?, true
-	
+
 	# C compiler flags that should be passed in order to enable debugging information.
 	def self.debugging_cflags
 		# According to OpenBSD's pthreads man page, pthreads do not work
@@ -549,7 +549,7 @@ public
 		end
 	end
 	memoize :electric_fence_ldflags
-	
+
 	def self.export_dynamic_flags
 		if os_name == "linux"
 			return '-rdynamic'
@@ -586,7 +586,7 @@ public
 		end
 	end
 	memoize :gnu_make, true
-	
+
 	def self.xcode_select_version
 		if find_command('xcode-select')
 			`xcode-select --version` =~ /version (.+)\./

data/lib/phusion_passenger/rack/thread_handler_extension.rb

@@ -69,7 +69,7 @@ module ThreadHandlerExtension
 			env[RACK_HIJACK] = lambda do
 				env[RACK_HIJACK_IO] ||= connection
 			end
-			
+
 			begin
 				status, headers, body = @app.call(env)
 			rescue => e

data/lib/phusion_passenger/request_handler/thread_handler.rb

@@ -102,7 +102,7 @@ class ThreadHandler
 		channel        = MessageChannel.new
 		buffer         = ''
 		buffer.force_encoding('binary') if buffer.respond_to?(:force_encoding)
-		
+
 		begin
 			finish_callback.call
 			while true
@@ -205,13 +205,13 @@ private
 			"HTTP header size exceeded maximum.")
 		return
 	end
-	
+
 	# Like parse_session_request, but parses an HTTP request. This is a very minimalistic
 	# HTTP parser and is not intended to be complete, fast or secure, since the HTTP server
 	# socket is intended to be used for debugging purposes only.
 	def parse_http_request(connection, channel, buffer)
 		headers = {}
-		
+
 		data = ""
 		while data !~ /\r\n\r\n/ && data.size < MAX_HEADER_SIZE
 			data << connection.readpartial(16 * 1024)
@@ -221,7 +221,7 @@ private
 				"HTTP header size exceeded maximum.")
 			return
 		end
-		
+
 		data.gsub!(/\r\n\r\n.*/, '')
 		data.split("\r\n").each_with_index do |line, i|
 			if i == 0
@@ -250,7 +250,7 @@ private
 				end
 			end
 		end
-		
+
 		if @connect_password && headers["HTTP_X_PASSENGER_CONNECT_PASSWORD"] != @connect_password
 			warn "*** Passenger RequestHandler warning: " <<
 				"someone tried to connect with an invalid connect password."
@@ -303,10 +303,10 @@ private
 			end
 			transaction.begin_measure("app request handler processing")
 		end
-		
+
 		#################
 	end
-	
+
 	def finalize_request(connection, headers, has_error)
 		transaction = headers[UNION_STATION_REQUEST_TRANSACTION]
 		Thread.current[UNION_STATION_CORE] = nil
@@ -354,7 +354,7 @@ private
 				end
 			end
 		end
-		
+
 		#################
 	end
 

data/lib/phusion_passenger/standalone/app_finder.rb

@@ -28,7 +28,7 @@ module Standalone
 class AppFinder
 	attr_accessor :dirs
 	attr_reader :apps
-	
+
 	def self.looks_like_app_directory?(dir)
 		return File.exist?("#{dir}/config.ru") ||
 			File.exist?("#{dir}/config/environment.rb") ||
@@ -36,7 +36,7 @@ class AppFinder
 			File.exist?("#{dir}/app.js") ||
 			File.exist?("#{dir}/.meteor")
 	end
-	
+
 	def initialize(dirs, options = {})
 		@dirs = dirs
 		@options = options.dup
@@ -45,11 +45,11 @@ class AppFinder
 	def global_options
 		return @options
 	end
-	
+
 	def scan
 		apps = []
 		watchlist = []
-		
+
 		if single_mode?
 			app_root = find_app_root
 			apps << {
@@ -59,7 +59,7 @@ class AppFinder
 			watchlist << app_root
 			watchlist << "#{app_root}/config" if File.exist?("#{app_root}/config")
 			watchlist << "#{app_root}/passenger-standalone.json" if File.exist?("#{app_root}/passenger-standalone.json")
-			
+
 			config_filename = File.join(app_root, "passenger-standalone.json")
 			if File.exist?(config_filename)
 				global_options = load_config_file!(:global_config, config_filename)
@@ -75,15 +75,15 @@ class AppFinder
 		@watchlist = watchlist
 		return apps
 	end
-	
+
 	def monitor(termination_pipe)
 		raise "You must call #scan first" if !@apps
-		
+
 		watcher = PhusionPassenger::Utils::FileSystemWatcher.new(@watchlist, termination_pipe)
 		if wait_on_io(termination_pipe, 3)
 			return
 		end
-		
+
 		while true
 			changed = watcher.wait_for_change
 			watcher.close
@@ -94,13 +94,13 @@ class AppFinder
 				if wait_on_io(termination_pipe, 0.25)
 					return
 				end
-				
+
 				new_apps = scan
 				watcher = PhusionPassenger::Utils::FileSystemWatcher.new(@watchlist, termination_pipe)
 				if old_apps != new_apps
 					yield(new_apps)
 				end
-				
+
 				# Don't process change events again for a short while,
 				# but do detect changes while waiting.
 				if wait_on_io(termination_pipe, 3)
@@ -117,11 +117,11 @@ class AppFinder
 	def single_mode?
 		return true
 	end
-	
+
 	def multi_mode?
 		return !single_mode?
 	end
-	
+
 	##################
 
 private
@@ -135,7 +135,7 @@ private
 			return File.expand_path(@dirs[0])
 		end
 	end
-	
+
 	def load_config_file!(context, filename)
 		PhusionPassenger.require_passenger_lib 'utils/json' if !defined?(PhusionPassenger::Utils::JSON)
 		begin
@@ -168,11 +168,11 @@ private
 		STDERR.puts "*** Warning: #{e.message}"
 		return {}
 	end
-	
+
 	def looks_like_app_directory?(dir)
 		return AppFinder.looks_like_app_directory?(dir)
 	end
-	
+
 	def filename_to_server_names(filename)
 		basename = File.basename(filename)
 		names = [basename]
@@ -181,7 +181,7 @@ private
 		end
 		return names
 	end
-	
+
 	# Wait until the given IO becomes readable, or until the timeout has
 	# been reached. Returns true if the IO became readable, false if the
 	# timeout has been reached.

data/lib/phusion_passenger/standalone/command.rb

@@ -40,17 +40,17 @@ class Command
 		:thread_count  => DEFAULT_THREAD_COUNT,
 		:nginx_version => PREFERRED_NGINX_VERSION
 	}.freeze
-	
+
 	include Utils
-	
+
 	def self.show_in_command_list
 		return true
 	end
-	
+
 	def self.description
 		return nil
 	end
-	
+
 	def initialize(args)
 		@args = args.dup
 		@original_args = args.dup
@@ -73,7 +73,7 @@ private
 					gem_command = PlatformInfo.gem_command(:sudo => true)
 					error "Your version of daemon_controller is too old. " <<
 					      "You must install 1.1.0 or later. Please upgrade:\n\n" <<
-					      
+
 					      " #{gem_command} uninstall FooBarWidget-daemon_controller\n" <<
 					      " #{gem_command} install daemon_controller",
 					      :wrap => false
@@ -88,7 +88,7 @@ private
 			end
 		end
 	end
-	
+
 	def require_erb
 		require 'erb' unless defined?(ERB)
 	end
@@ -96,23 +96,23 @@ private
 	def require_etc
 		require 'etc' unless defined?(Etc)
 	end
-	
+
 	def require_optparse
 		require 'optparse' unless defined?(OptionParser)
 	end
-	
+
 	def require_app_finder
 		PhusionPassenger.require_passenger_lib 'standalone/app_finder' unless defined?(AppFinder)
 	end
-	
+
 	def debugging?
 		return ENV['PASSENGER_DEBUG'] && !ENV['PASSENGER_DEBUG'].empty?
 	end
-	
+
 	def parse_options!(command_name, description = nil)
 		require_etc
 		help = false
-		
+
 		home_dir = PhusionPassenger::Utils.home_dir
 		global_config_file = File.join(home_dir, USER_NAMESPACE_DIRNAME, "standalone", "config")
 		if File.exist?(global_config_file)
@@ -120,7 +120,7 @@ private
 			global_options = ConfigFile.new(:global_config, global_config_file).options
 			@options.merge!(global_options)
 		end
-		
+
 		require_optparse
 		parser = OptionParser.new do |opts|
 			opts.banner = "Usage: passenger #{command_name} [options]"
@@ -137,7 +137,7 @@ private
 			exit 0
 		end
 	end
-	
+
 	def error(message, options = {})
 		wrap = options.fetch(:wrap, true)
 		if message =~ /\n/
@@ -157,7 +157,7 @@ private
 		end
 		@plugin.call_hook(:error, message) if @plugin
 	end
-	
+
 	# Word wrap the given option description text so that it is formatted
 	# nicely in the --help output.
 	def wrap_desc(description_text, max_width = 43, newline_prefix_size = 37)
@@ -173,7 +173,7 @@ private
 			FileUtils.mkdir_p(dir)
 		end
 	end
-	
+
 	def determine_various_resource_locations(create_subdirs = true)
 		require_app_finder
 		if @options[:socket_file]
@@ -200,7 +200,7 @@ private
 			@options[:log_file] ||= File.expand_path(File.join(@args[0], log_basename))
 		end
 	end
-	
+
 	def write_nginx_config_file
 		PhusionPassenger.require_passenger_lib 'platform_info/ruby'
 		PhusionPassenger.require_passenger_lib 'utils/tmpio'
@@ -220,7 +220,7 @@ private
 			PhusionPassenger::REQUIRED_LOCATIONS_INI_FIELDS +
 			PhusionPassenger::OPTIONAL_LOCATIONS_INI_FIELDS -
 			[:agents_dir, :lib_dir]
-		
+
 		File.open(location_config_filename, 'w') do |f|
 			f.puts '[locations]'
 			f.puts "natively_packaged=#{PhusionPassenger.natively_packaged?}"
@@ -235,13 +235,13 @@ private
 			end
 		end
 		puts File.read(location_config_filename) if debugging?
-		
+
 		File.open(@config_filename, 'w') do |f|
 			f.chmod(0644)
 			require_erb
 			erb = ERB.new(File.read(nginx_config_template_filename), nil, "-")
 			current_user = Etc.getpwuid(Process.uid).name
-			
+
 			# The template requires some helper methods which are defined in start_command.rb.
 			output = erb.result(binding)
 			f.write(output)
@@ -271,7 +271,7 @@ private
 		end
 		return [items.join(null)].pack('m*').gsub("\n", "").strip
 	end
-	
+
 	def determine_nginx_start_command
 		if @options[:nginx_bin]
 			nginx_bin = @options[:nginx_bin]
@@ -280,7 +280,7 @@ private
 		end
 		return "#{nginx_bin} -c '#{@config_filename}' -p '#{@temp_dir}/'"
 	end
-	
+
 	# Returns the port on which to ping Nginx.
 	def nginx_ping_port
 		if @options[:ping_port]
@@ -289,7 +289,7 @@ private
 			return @options[:port]
 		end
 	end
-	
+
 	def create_nginx_controller(extra_options = {})
 		require_daemon_controller
 		require 'socket' unless defined?(UNIXSocket)

data/packaging/rpm/LICENSE.txt

@@ -0,0 +1,19 @@
+Copyright (c) 2014 Phusion
+
+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.