passenger 4.0.52 → 4.0.53

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjRlNTE0MzE0YjI2ZjJmOTZkMzk5YmY2OWQyYjIwOThkZTQzNjAxZg==
+    NjExNzc1ZGFkYzExOGNhMDA5NmUyNzcxNmQwYzUwNDg5NjMwM2VlMA==
   data.tar.gz: !binary |-
-    YjBiMDA3YWQzZDBkYWRhMDIwZjc2YjdkNjc2MzBhZDU5MWFjYzJiMQ==
+    Y2MxMzRkOTM4NzY4YzJjYTVlNzJiNzI5MmI3MzFlZjVhZDRjMWU2Yw==
 SHA512:
   metadata.gz: !binary |-
-    OWJlMjljNTA3NWIwM2Q5OTA0MThkMDQ4MWRkMWRjYmI3MWYxY2NmNGY2N2Qw
-    YWNmYTVhYjJlNjMyNTNkOWJhM2QyZTYyMTViMGQ5NjQwYWE2YzYwZDBhMDdm
-    N2NjYzI1ODRlNThmYjIzNTQzN2QyMjI0ZmI0NDk3NDg0ODljNmI=
+    YTgyNTE1MjExOWQ0NTA1ZGI2Y2Q3OWEwMTkyY2UwZDkzZGU5MjM4ZjA2OGRk
+    OTU3NmU1NDM0ZmUwMDBlOTgzZTUzMDM0OWI4MTVkNDdjYzcxOWVlZGEwN2U0
+    OWRlODZhM2IzOWRkN2YxMzVhOWVlY2M2NDJjMWU0MGNlNmIwODg=
   data.tar.gz: !binary |-
-    MjQ4N2RiZDNhYzQ4N2QyZTE4YzUyNGZhMzhlMzIyZjNiMjFlM2QyZWRhNTBj
-    ZjEzOGY2ZjkxZGUyZTk4MDI1NjVjN2IyMWEzM2EyMmM2ZDFlMTA1OWE0ZTQ5
-    YWZjOWUyOTA2Yzc3NGNlMDIxZjgwMWU2ZjAzZGZiYzFlZDc1NzY=
+    OTMxYTJkN2YwN2I5NTM0MDU1YWUwNDU3MDQ3MDY0OTUyMTdkNGU5MzJhYTY4
+    NmE0NWNmNDcwODM5Yzg4NzRiNWQwNGZhZjVhN2Y4NjliOWQ2NGRjZjA3YjQ5
+    NWMzMWU4NmY3ZjJmOWZmYTYzMGY1MTY3Y2NiODJhZWNiMGQ5ZTI=

checksums.yaml.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJUIrGwAAoJECrHRaUKISqMdB4H/Ak9NUeasriD0c2hwWOVB1Hn
-VjpEHwspCA7ompQEN/IpsLbi+lJpvGE1Qhvyht8T/rl3v/WGrI4tnCoeIDohggBo
-LqVOe81lmSI0/edCoMwpSaEb+bvsOhUnw5abfE7byKacNRWrxCTBmJYCbVjJE77k
-XsunpKAFIKrYHYJ+HHsBk3hmFyHkoS8df3W1gpGLoyDy2oWLLnNUdJvd1CZQfYaQ
-X54Zg5UlbGFSVyGJ12Bn0aLlp7k4zy8d8owv1V/+UDsBBDFMYGVlCHsVj0qPjnTD
-m1GWI7dUeGZ1XnM9sEBdjRQ47Evt7btTJajTrHppFlBVSkbGuI8uQIT0ebkXwlk=
-=MvU6
+iQEcBAABAgAGBQJUK9ckAAoJECrHRaUKISqMwkUH/292jpZG5srKKCIySJcDRYz5
+Putx9SR98up1JzG5n/gNERdHMp+IHoK8mlwSYP0+oMN1KSX5uRsEKJbkxKR1BGYg
+aP2jVpJ1g8l8H73FCdA3SI50/q0xB+WnebuTcJdZ/NaJmI1m19YmFxD2NGbY84+W
+c0Z+r6ck2FmwsQEklwM1Sy9gh8ZcfXsey7ve3a4jVgc01J12cFIsOExEgnu4WM/F
+2+4ZodzFIjmF9wDB8AHlG9RK8JkXjNiCdxjxAqf/kb+MzebioB75BsX38TPACbje
+SLAElIgmyjKec33NDDtH6GiJxz51z0V0qha9OMXMtucvTD0rEj/DzbCGupOVUm0=
+=4g5+
 -----END PGP SIGNATURE-----

data.tar.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJUIrGwAAoJECrHRaUKISqMDmwH/RexAu5DMj7aCGCbwwhMJPwS
-aFGITxBHW0VGwPHSeBuLTOA0I85OSpw+UkJvZ1xQTs2n9WOlfARwYaDEQFYxdyQV
-Cwerj3xx9dwIvEBRmqHLgF+/VuP4lvUxN/evpjxtNH088wsVs7MKWDHZiKXgCn9R
-AmCirZVIAamD2C4JS8VRaYRaaLXOKNbS3js+by0NT7daKn4S9MDJbLPcCUpz9B39
-sntYnVI0TKTix7/hGMEkSapxTR+cLzEo83WVYCVxaIL8+iMaIwb10sJNjlocnIxb
-WcvLZqxPPyYxDlfx6DGywmAp07qOBp6bc2aTcCsU5Em+Y5J+J5mq5VyRVLRMBpM=
-=pz/S
+iQEcBAABAgAGBQJUK9ckAAoJECrHRaUKISqM4l0IAIxyvBpZ6hszbK0nKNQupO3Z
+/NkSYS79zUOJ9EMjHFNFxeVEG0IdYxLWyPNsqns1DUMg0t7aJdMV8sotoM+jsxuY
+mJ7DZNG+3nNbxeS3p80fzF7PbicyvcqTLOiWnX/r47EbkQCvLpTHk+NI8JKasW/Y
+3z6RQ7qwcds2UPw9kh/Yhm0m1INQl4tUFz+hfKfPIk3/pixfrnEZWVZSUF7B+CP2
+cTsTriX5kRUP2oXW3SFSoGAiY3xSilnGhG1JdzG05WLdaDyrRn6ibYxEuX2hrXXN
+FfDrv0ntvcZ1FRybJMGjejcRp8Z8/Xb2kvLL2Xyu32qDexfmqtr9FQkQU8dZjt8=
+=Galp
 -----END PGP SIGNATURE-----

data/.editorconfig

@@ -6,6 +6,10 @@ root = true
 end_of_line = lf
 charset = utf-8
 
+[bin/*]
+indent_style=tab
+indent_size=4
+
 [doc/*.txt]
 indent_style=tab
 indent_size=4
@@ -48,6 +52,20 @@ indent_style = tab
 indent_size = 4
 trim_trailing_whitespace = true
 
-[ext/nginx/{*.c,*.h}]
+[ext/nginx/*.c]
+indent_style = space
+indent_size = 4
+
+[ext/nginx/*.h]
 indent_style = space
 indent_size = 4
+
+[ext/libeio/*.c]
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = false
+
+[ext/libeio/*.h]
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = false

data/CHANGELOG

@@ -1,3 +1,11 @@
+Release 4.0.53
+--------------
+
+ * Upgraded the preferred Nginx version to 1.6.2.
+ * Improved RVM gemset autodetection.
+ * Fixed some Ruby 2.2 compatibility issues.
+
+
 Release 4.0.52
 --------------
 

data/Rakefile

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (C) 2008-2013  Phusion
+#  Copyright (C) 2008-2014  Phusion
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -49,7 +49,12 @@ task :default do
 end
 
 desc "Remove compiled files"
-task :clean => 'clean:cache'
+task :clean => 'clean:cache' do
+	if OUTPUT_DIR == "buildout/"
+		sh "rm -rf buildout"
+	end
+end
+
 task 'common:clean' => 'clean:cache'
 task 'clean:cache' do
 	sh "rm -rf #{OUTPUT_DIR}cache"

data/build/packaging.rb

@@ -179,6 +179,9 @@ task 'package:release' => ['package:set_official', 'package:gem', 'package:tarba
 					response.body
 			end
 
+			puts "Initiating building of binaries"
+			Rake::Task['package:initiate_binaries_building'].invoke
+
 			puts "Initiating building of Debian packages"
 			Rake::Task['package:initiate_debian_building'].invoke
 
@@ -216,11 +219,7 @@ task 'package:release' => ['package:set_official', 'package:gem', 'package:tarba
 			end
 
 			puts "Initiating building of binaries"
-			command = "cd /srv/passenger_autobuilder/app && " +
-				"/tools/silence-unless-failed -f /tmp/passenger_autobuilder.log " +
-				"chpst -l /var/cache/passenger_ci/lock " +
-				"./autobuild-with-pbuilder #{enterprise_git_url} passenger-enterprise --tag=#{git_tag}"
-			sh "ssh psg_autobuilder_run@juvia-helper.phusion.nl at now <<<'#{command}'"
+			Rake::Task['package:initiate_binaries_building'].invoke
 
 			puts "Initiating building of Debian packages"
 			Rake::Task['package:initiate_debian_building'].invoke
@@ -352,19 +351,98 @@ task 'package:update_homebrew' do
 	end
 end
 
+task 'package:initiate_binaries_building' do
+	require 'yaml'
+	require 'uri'
+	require 'net/http'
+	require 'net/https'
+	version = VERSION_STRING
+	begin
+		website_config = YAML.load_file(File.expand_path("~/.passenger_website.yml"))
+	rescue Errno::ENOENT
+		STDERR.puts "-------------------"
+		abort "*** ERROR: Please put the Phusion Passenger website admin " +
+			"password in ~/.passenger_website.yml:\n" +
+			"admin_password: ..."
+	end
+	if is_open_source?
+		type = "open%20source"
+		jenkins_token = website_config["jenkins_token"]
+		if !jenkins_token
+			abort "*** ERROR: Please put the Passenger open source Jenkins " +
+				"authentication token in ~/.passenger_website.yml, under " +
+				"the 'jenkins_token' key."
+		end
+	else
+		type = "Enterprise"
+		jenkins_token = website_config["jenkins_enterprise_token"]
+		if !jenkins_token
+			abort "*** ERROR: Please put the Passenger Enterprise Jenkins " +
+				"authentication token in ~/.passenger_website.yml, under " +
+				"the 'jenkins_enterprise_token' key."
+		end
+	end
+
+	uri = URI.parse("https://oss-jenkins.phusion.nl/buildByToken/buildWithParameters?" +
+		"job=Passenger%20#{type}%20binaries%20(release)&token=#{jenkins_token}&tag=#{git_tag}")
+	http = Net::HTTP.new(uri.host, uri.port)
+	http.use_ssl = true
+	http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+	request = Net::HTTP::Post.new(uri.request_uri)
+	response = http.request(request)
+	if response.code != 200 && response.body != "Scheduled.\n"
+		abort "*** ERROR: Cannot initiate building of binaries:\n" +
+			"Status: #{response.code}\n\n" +
+			response.body
+	end
+	puts "Initiated building of binaries."
+end
+
 task 'package:initiate_debian_building' do
+	require 'yaml'
+	require 'uri'
+	require 'net/http'
+	require 'net/https'
 	version = VERSION_STRING
+	begin
+		website_config = YAML.load_file(File.expand_path("~/.passenger_website.yml"))
+	rescue Errno::ENOENT
+		STDERR.puts "-------------------"
+		abort "*** ERROR: Please put the Phusion Passenger website admin " +
+			"password in ~/.passenger_website.yml:\n" +
+			"admin_password: ..."
+	end
 	if is_open_source?
-		command = "cd /srv/passenger_apt_automation && " +
-			"/tools/silence-unless-failed " +
-			"./new_release https://github.com/phusion/passenger.git passenger #{git_tag}"
+		type = "open%20source"
+		jenkins_token = website_config["jenkins_token"]
+		if !jenkins_token
+			abort "*** ERROR: Please put the Passenger open source Jenkins " +
+				"authentication token in ~/.passenger_website.yml, under " +
+				"the 'jenkins_token' key."
+		end
 	else
-		command = "cd /srv/passenger_apt_automation && " +
-			"/tools/silence-unless-failed " +
-			"./new_release #{enterprise_git_url} passenger-enterprise #{git_tag}"
+		type = "Enterprise"
+		jenkins_token = website_config["jenkins_enterprise_token"]
+		if !jenkins_token
+			abort "*** ERROR: Please put the Passenger Enterprise Jenkins " +
+				"authentication token in ~/.passenger_website.yml, under " +
+				"the 'jenkins_enterprise_token' key."
+		end
 	end
 
-	sh "ssh psg_apt_automation@juvia-helper.phusion.nl at now <<<'#{command}'"
+	uri = URI.parse("https://oss-jenkins.phusion.nl/buildByToken/buildWithParameters?" +
+		"job=Passenger%20#{type}%20Debian%20packages%20(release)&token=#{jenkins_token}&ref=#{git_tag}")
+	http = Net::HTTP.new(uri.host, uri.port)
+	http.use_ssl = true
+	http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+	request = Net::HTTP::Post.new(uri.request_uri)
+	response = http.request(request)
+	if response.code != 200 && response.body != "Scheduled.\n"
+		abort "*** ERROR: Cannot initiate building of Debian packages:\n" +
+			"Status: #{response.code}\n\n" +
+			response.body
+	end
+	puts "Initiated building of Debian packages."
 end
 
 task 'package:build_osx_binaries' do

data/ext/common/Constants.h

@@ -90,7 +90,7 @@
 
 	#define NGINX_DOC_URL "https://www.phusionpassenger.com/documentation/Users%20guide%20Nginx.html"
 
-	#define PASSENGER_VERSION "4.0.52"
+	#define PASSENGER_VERSION "4.0.53"
 
 	#define POOL_HELPER_THREAD_STACK_SIZE 262144
 

data/lib/phusion_passenger.rb

@@ -30,10 +30,10 @@ module PhusionPassenger
 
 	PACKAGE_NAME = 'passenger'
 	# Run 'rake ext/common/Constants.h' after changing this number.
-	VERSION_STRING = '4.0.52'
+	VERSION_STRING = '4.0.53'
 
-	PREFERRED_NGINX_VERSION = '1.6.1'
-	NGINX_SHA256_CHECKSUM = 'f5cfe682a1aeef4602c2ca705402d5049b748f946563f41d8256c18674836067'
+	PREFERRED_NGINX_VERSION = '1.6.2'
+	NGINX_SHA256_CHECKSUM = 'b5608c2959d3e7ad09b20fc8f9e5bd4bc87b3bc8ba5936a513c04ed8f1391a18'
 
 	PREFERRED_PCRE_VERSION  = '8.34'
 	PCRE_SHA256_CHECKSUM = '1dd78994c81e44ac41cf30b2a21d4b4cc6d76ccde7fc6e77713ed51d7bddca47'

data/lib/phusion_passenger/platform_info/ruby.rb

@@ -37,13 +37,21 @@ module PlatformInfo
 		gem_home = nil if gem_home.empty?
 	end
 	GEM_HOME = gem_home
-	
+
+	# Ditto for $GEM_PATH
+	gem_path = ENV['GEM_PATH']
+	if gem_path
+		gem_path = gem_path.strip.freeze
+		gem_path = nil if gem_path.empty?
+	end
+	GEM_PATH = gem_path
+
 	if defined?(::RUBY_ENGINE)
 		RUBY_ENGINE = ::RUBY_ENGINE
 	else
 		RUBY_ENGINE = "ruby"
 	end
-	
+
 	# Returns correct command for invoking the current Ruby interpreter.
 	# In case of RVM this function will return the path to the RVM wrapper script
 	# that executes the current Ruby interpreter in the currently active gem set.
@@ -81,7 +89,7 @@ module PlatformInfo
 				# Correctness of these commands are confirmed by mpapis.
 				# If we ever encounter a case for which this logic is not sufficient,
 				# try mpapis' pseudo code:
-				# 
+				#
 				#   rvm_update_prefix  = write_to rvm_path ? "" : "rvmsudo"
 				#   rvm_gemhome_prefix  = write_to GEM_HOME ? "" : "rvmsudo"
 				#   repair_command  = "#{rvm_update_prefix} rvm get stable && rvm reload && #{rvm_gemhome_prefix} rvm repair all"
@@ -121,7 +129,7 @@ module PlatformInfo
 		end
 	end
 	memoize :ruby_command
-	
+
 	# Returns the full path to the current Ruby interpreter's executable file.
 	# This might not be the actual correct command to use for invoking the Ruby
 	# interpreter; use ruby_command instead.
@@ -129,7 +137,7 @@ module PlatformInfo
 		@@ruby_executable ||=
 			rb_config['bindir'] + '/' + rb_config['RUBY_INSTALL_NAME'] + rb_config['EXEEXT']
 	end
-	
+
 	# Returns whether the Ruby interpreter supports process forking.
 	def self.ruby_supports_fork?
 		# MRI >= 1.9.2's respond_to? returns false for methods
@@ -146,7 +154,7 @@ module PlatformInfo
 		# Too much of a trouble for JRuby. We can do without it.
 		return RUBY_ENGINE != "jruby"
 	end
-	
+
 	# Returns the correct 'gem' command for this Ruby interpreter.
 	# If `:sudo => true` is given, then the gem command is prefixed by a
 	# sudo command if filesystem permissions require this.
@@ -169,7 +177,7 @@ module PlatformInfo
 		end
 	end
 	memoize :gem_install_requires_sudo?
-	
+
 	# Returns the absolute path to the Rake executable that
 	# belongs to the current Ruby interpreter. Returns nil if it
 	# doesn't exist.
@@ -180,7 +188,7 @@ module PlatformInfo
 		return locate_ruby_tool('rake')
 	end
 	memoize :rake
-	
+
 	# Returns the correct command string for invoking the Rake executable
 	# that belongs to the current Ruby interpreter. Returns nil if Rake is
 	# not found.
@@ -199,7 +207,7 @@ module PlatformInfo
 		end
 	end
 	memoize :rake_command
-	
+
 	# Returns the absolute path to the RSpec runner program that
 	# belongs to the current Ruby interpreter. Returns nil if it
 	# doesn't exist.
@@ -207,18 +215,18 @@ module PlatformInfo
 		return locate_ruby_tool('rspec')
 	end
 	memoize :rspec
-	
+
 	# Returns whether the current Ruby interpreter is managed by RVM.
 	def self.in_rvm?
 		bindir = rb_config['bindir']
 		return bindir.include?('/.rvm/') || bindir.include?('/rvm/')
 	end
-	
+
 	# If the current Ruby interpreter is managed by RVM, returns all
 	# directories in which RVM places its working files. This is usually
 	# ~/.rvm or /usr/local/rvm, but in mixed-mode installations there
 	# can be multiple such paths.
-	# 
+	#
 	# Otherwise returns nil.
 	def self.rvm_paths
 		if in_rvm?
@@ -250,7 +258,7 @@ module PlatformInfo
 		end
 	end
 	memoize :rvm_paths
-	
+
 	# If the current Ruby interpreter is managed by RVM, returns the
 	# RVM name which identifies the current Ruby interpreter plus the
 	# currently active gemset, e.g. something like this:
@@ -264,12 +272,12 @@ module PlatformInfo
 			# in the latest versions in order to fight env var pollution.
 			# Scanning $LOAD_PATH seems to be the only way to obtain
 			# the information.
-			
+
 			# Getting the RVM name of the Ruby interpreter ("ruby-1.9.2")
 			# isn't so hard, we can extract it from the #ruby_executable
 			# string. Getting the gemset name is a bit harder, so let's
 			# try various strategies...
-			
+
 			# $GEM_HOME usually contains the gem set name.
 			# It may be something like:
 			#   /Users/hongli/.rvm/gems/ruby-1.9.3-p392
@@ -278,9 +286,18 @@ module PlatformInfo
 			if GEM_HOME && GEM_HOME =~ %r{rvm/gems/(.+)}
 				return $1.sub(/\/.*/, '')
 			end
-			
-			# User somehow managed to nuke $GEM_HOME. Extract info
-			# from $LOAD_PATH.
+
+			# User might have explicitly set GEM_HOME to a custom directory,
+			# or might have nuked $GEM_HOME. Extract info from $GEM_PATH.
+			if GEM_PATH
+				GEM_PATH.split(':').each do |gem_path|
+					if gem_path =~ %r{rvm/gems/(.+)}
+						return $1.sub(/\/.*/, '')
+					end
+				end
+			end
+
+			# That failed too. Try extracting info from from $LOAD_PATH.
 			matching_path = $LOAD_PATH.find_all do |item|
 				item.include?("rvm/gems/")
 			end
@@ -327,7 +344,7 @@ module PlatformInfo
 			return nil
 		end
 	end
-	
+
 	# Returns either 'sudo' or 'rvmsudo' depending on whether the current
 	# Ruby interpreter is managed by RVM.
 	def self.ruby_sudo_command
@@ -360,7 +377,7 @@ module PlatformInfo
 			return "sudo -s #{args}".strip
 		end
 	end
-	
+
 	# Locates a Ruby tool command, e.g. 'gem', 'rake', 'bundle', etc. Instead of
 	# naively looking in $PATH, this function uses a variety of search heuristics
 	# to find the command that's really associated with the current Ruby interpreter.
@@ -433,7 +450,7 @@ private
 		filename
 	end
 	private_class_method :locate_ruby_tool_by_basename
-	
+
 	def self.is_ruby_program?(filename)
 		File.open(filename, 'rb') do |f|
 			return f.readline =~ /ruby/
@@ -442,7 +459,7 @@ private
 		return false
 	end
 	private_class_method :is_ruby_program?
-	
+
 	# Deduce Ruby's --program-prefix and --program-suffix from its install name
 	# and transforms the given input name accordingly.
 	#

data/lib/phusion_passenger/ruby_core_enhancements.rb

@@ -1,6 +1,6 @@
 # encoding: binary
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010, 2011, 2012 Phusion
+#  Copyright (c) 2010-2014 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -76,7 +76,7 @@ class IO
 		def writev(components)
 			return PhusionPassenger::NativeSupport.writev(fileno, components)
 		end
-		
+
 		# Like #writev, but accepts two arrays. The data is written in the given order.
 		#
 		#   io.writev2(["hello ", "world", "\n"], ["another ", "message\n"])
@@ -84,7 +84,7 @@ class IO
 			return PhusionPassenger::NativeSupport.writev2(fileno,
 				components, components2)
 		end
-		
+
 		# Like #writev, but accepts three arrays. The data is written in the given order.
 		#
 		#   io.writev3(["hello ", "world", "\n"],
@@ -124,7 +124,7 @@ class IO
 			return write(data)
 		end
 	end
-	
+
 	if IO.method_defined?(:close_on_exec=)
 		def close_on_exec!
 			self.close_on_exec = true
@@ -163,16 +163,17 @@ module Signal
 			result.delete("ALRM")
 			result.delete("VTALRM")
 		end
-		
+
 		# Don't touch SIGCHLD no matter what! On OS X waitpid() will
 		# malfunction if SIGCHLD doesn't have a correct handler.
 		result.delete("CLD")
 		result.delete("CHLD")
-		
+
 		# Other stuff that we don't want to trap no matter which
 		# Ruby engine.
 		result.delete("STOP")
-		
+		result.delete("KILL")
+
 		return result
 	end
 end

data/test/stub/rails4.0/config/initializers/passenger.rb

@@ -1,5 +1,2 @@
-if defined?(PhusionPassenger)
-	PhusionPassenger.install_framework_extensions!(
-		event_preprocessor: ->(e) { e.payload[:sql].gsub!("secret","PASSWORD") if e.payload[:sql] }
-	)
-end
+event_preprocessor = lambda { |e| e.payload[:sql].gsub!("secret","PASSWORD") if e.payload[:sql] }
+PhusionPassenger.install_framework_extensions!(:event_preprocessor => event_preprocessor ) if defined?(PhusionPassenger)

data/test/stub/rails4.1/config/initializers/passenger.rb

@@ -1,5 +1,5 @@
 if defined?(PhusionPassenger)
 	PhusionPassenger.install_framework_extensions!(
-		event_preprocessor: ->(e) { e.payload[:sql].gsub!("secret","PASSWORD") if e.payload[:sql] }
+		event_preprocessor: lambda { |e| e.payload[:sql].gsub!("secret","PASSWORD") if e.payload[:sql] }
 	)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passenger
 version: !ruby/object:Gem::Version
-  version: 4.0.52
+  version: 4.0.53
 platform: ruby
 authors:
 - Phusion - http://www.phusion.nl/
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-24 00:00:00.000000000 Z
+date: 2014-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake

metadata.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJUIrGwAAoJECrHRaUKISqM7NEIALCdqXlwc3SRlgcF7wyk6Xg+
-xUPa44bIorybP1B1X5Thc+Q2dLnxwsWJ/O6qe03YD04RPW3Sqm+HCeXe5ul3BzyM
-lUKVqiOSLjYqCYUE+H8pxc699Dj0lD6kb59V/7hpy6Nv1fzGwiKM4FPF4B6ipAC8
-SrUBnyLanx7y58E3MXAhdnCNTErUB6m/ehyaeMlv9vrkFPBAefKzssHVeBU8nwib
-abZSjP6U/yw4OWkMSIYmcZwX1mWfM4gOCgpoHj25jJdIyvwGdl1o6KUPyYZgiJRO
-7kxgxPF4eoeVsvW+PBARD5jDNeQn0QlqAV/XZe/DBsvdfnHdbWDC/H8URbxMawQ=
-=rzhF
+iQEcBAABAgAGBQJUK9cjAAoJECrHRaUKISqMRTgIAKJVJG6YhhvH+p0wfTavrjXs
+sQ3ovOKf3NchudkMC24B0D88I4hvYCsFPmA9ltllpnh95IJu9ffDL3jp5Pb/vh+E
+dWpEojuzw03gaob9JYNMVij3V7yKfSznGQwjOgpcz1/dSwGElOoZdSMsL0OHJRXl
+k+d9c6PpiJqn1wdmIIez91zeENFuxcc9qlTPJWFGgQvaztnV78Av0KBO6d46ohRt
+fon/+sj4BVpsg3kvj5Z/dzegCHd1FX6LTvNrnrfcFf+IR1ky1XhS+NPM6AZbUnsf
+WlszF70EnEgxBCZDtpiUlJKBg16P7XSAVE5dyzM082jvZeBs1t5ZJzEmCNCwDhM=
+=R6Mx
 -----END PGP SIGNATURE-----