passenger 3.0.0 → 3.0.1

data/build/common_library.rb

@@ -1,18 +1,25 @@
 #  Phusion Passenger - http://www.modrails.com/
-#  Copyright (C) 2010  Phusion
+#  Copyright (c) 2010 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
-#  the Free Software Foundation; version 2 of the License.
+#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
+#  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:
 #
-#  You should have received a copy of the GNU General Public License along
-#  with this program; if not, write to the Free Software Foundation, Inc.,
-#  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#  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.
 
 
 # Defines tasks for compiling a static library containing code shared between
@@ -85,24 +92,54 @@ def define_common_library_task(namespace, output_dir, extra_compiler_flags = nil
 	# Define compilation targets for the object files in libpassenger_common.
 	flags =  "-Iext -Iext/common #{LIBEV_CFLAGS} #{extra_compiler_flags} "
 	flags << "#{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS}"
-	common_object_files = []
-	components.each_pair do |object_name, dependencies|
-		source_file = dependencies[0]
-		object_file = "#{output_dir}/#{object_name}"
-		common_object_files << object_file
-		dependencies = dependencies.map do |dep|
-			"ext/common/#{dep}"
+	
+	if boolean_option('RELEASE')
+		sources = []
+		components.each_pair do |object_name, dependencies|
+			sources << "ext/common/#{dependencies[0]}"
 		end
+		sources.sort!
 		
-		file object_file => dependencies do
+		aggregate_source = "#{output_dir}/aggregate.cpp"
+		aggregate_object = "#{output_dir}/aggregate.o"
+		object_files     = [aggregate_object]
+		
+		file(aggregate_object => sources) do
 			sh "mkdir -p #{output_dir}" if !File.directory?(output_dir)
-			sh "mkdir -p #{output_dir}/Utils" if !File.directory?("#{output_dir}/Utils")
-			compile_cxx("ext/common/#{source_file}", "#{flags} -o #{object_file}")
+			aggregate_content = %Q{
+				#ifndef _GNU_SOURCE
+					#define _GNU_SOURCE
+				#endif
+			}
+			sources.each do |source_file|
+				name = source_file.sub(/^ext\//, '')
+				aggregate_content << "#include \"#{name}\"\n"
+			end
+			File.open(aggregate_source, 'w') do |f|
+				f.write(aggregate_content)
+			end
+			compile_cxx(aggregate_source, "#{flags} -o #{aggregate_object}")
+		end
+	else
+		object_files = []
+		components.each_pair do |object_name, dependencies|
+			source_file = dependencies[0]
+			object_file = "#{output_dir}/#{object_name}"
+			object_files << object_file
+			dependencies = dependencies.map do |dep|
+				"ext/common/#{dep}"
+			end
+		
+			file object_file => dependencies do
+				sh "mkdir -p #{output_dir}" if !File.directory?(output_dir)
+				sh "mkdir -p #{output_dir}/Utils" if !File.directory?("#{output_dir}/Utils")
+				compile_cxx("ext/common/#{source_file}", "#{flags} -o #{object_file}")
+			end
 		end
 	end
 	
-	file(static_library => common_object_files) do
-		create_static_library(static_library, "#{output_dir}/*.o #{output_dir}/Utils/*.o")
+	file(static_library => object_files) do
+		create_static_library(static_library, object_files.join(' '))
 	end
 	
 	task "#{namespace}:clean" do
@@ -117,40 +154,66 @@ def define_libboost_oxt_task(namespace, output_dir, extra_compiler_flags = nil)
 	output_file = "#{output_dir}.a"
 	flags = "-Iext #{extra_compiler_flags} #{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS}"
 	
-	# Define compilation targets for .cpp files in ext/boost/src/pthread.
-	boost_object_files = []
-	Dir['ext/boost/src/pthread/*.cpp'].each do |source_file|
-		object_name = File.basename(source_file.sub(/\.cpp$/, '.o'))
-		boost_output_dir  = "#{output_dir}/boost"
-		object_file = "#{boost_output_dir}/#{object_name}"
-		boost_object_files << object_file
+	if boolean_option('RELEASE')
+		sources = Dir['ext/boost/src/pthread/*.cpp'] + Dir['ext/oxt/*.cpp']
+		sources.sort!
+		
+		aggregate_source = "#{output_dir}/aggregate.cpp"
+		aggregate_object = "#{output_dir}/aggregate.o"
+		object_files     = [aggregate_object]
 		
-		file object_file => source_file do
-			sh "mkdir -p #{boost_output_dir}" if !File.directory?(boost_output_dir)
-			compile_cxx(source_file, "#{flags} -o #{object_file}")
+		file(aggregate_object => sources) do
+			sh "mkdir -p #{output_dir}" if !File.directory?(output_dir)
+			aggregate_content = %Q{
+				#ifndef _GNU_SOURCE
+					#define _GNU_SOURCE
+				#endif
+			}
+			sources.each do |source_file|
+				name = source_file.sub(/^ext\//, '')
+				aggregate_content << "#include \"#{name}\"\n"
+			end
+			File.open(aggregate_source, 'w') do |f|
+				f.write(aggregate_content)
+			end
+			compile_cxx(aggregate_source, "#{flags} -o #{aggregate_object}")
+		end
+	else
+		# Define compilation targets for .cpp files in ext/boost/src/pthread.
+		boost_object_files = []
+		Dir['ext/boost/src/pthread/*.cpp'].each do |source_file|
+			object_name = File.basename(source_file.sub(/\.cpp$/, '.o'))
+			boost_output_dir  = "#{output_dir}/boost"
+			object_file = "#{boost_output_dir}/#{object_name}"
+			boost_object_files << object_file
+		
+			file object_file => source_file do
+				sh "mkdir -p #{boost_output_dir}" if !File.directory?(boost_output_dir)
+				compile_cxx(source_file, "#{flags} -o #{object_file}")
+			end
 		end
-	end
-	
-	# Define compilation targets for .cpp files in ext/oxt.
-	oxt_object_files = []
-	oxt_dependency_files = Dir["ext/oxt/*.hpp"] + Dir["ext/oxt/detail/*.hpp"]
-	Dir['ext/oxt/*.cpp'].each do |source_file|
-		object_name = File.basename(source_file.sub(/\.cpp$/, '.o'))
-		oxt_output_dir  = "#{output_dir}/oxt"
-		object_file = "#{oxt_output_dir}/#{object_name}"
-		oxt_object_files << object_file
 		
-		file object_file => [source_file, *oxt_dependency_files] do
-			sh "mkdir -p #{oxt_output_dir}" if !File.directory?(oxt_output_dir)
-			compile_cxx(source_file, "#{flags} -o #{object_file}")
+		# Define compilation targets for .cpp files in ext/oxt.
+		oxt_object_files = []
+		oxt_dependency_files = Dir["ext/oxt/*.hpp"] + Dir["ext/oxt/detail/*.hpp"]
+		Dir['ext/oxt/*.cpp'].each do |source_file|
+			object_name = File.basename(source_file.sub(/\.cpp$/, '.o'))
+			oxt_output_dir  = "#{output_dir}/oxt"
+			object_file = "#{oxt_output_dir}/#{object_name}"
+			oxt_object_files << object_file
+
+			file object_file => [source_file, *oxt_dependency_files] do
+				sh "mkdir -p #{oxt_output_dir}" if !File.directory?(oxt_output_dir)
+				compile_cxx(source_file, "#{flags} -o #{object_file}")
+			end
 		end
+		
+		object_files = boost_object_files + oxt_object_files
 	end
 	
-	file(output_file => boost_object_files + oxt_object_files) do
-		sh "mkdir -p #{output_dir}/boost #{output_dir}/oxt"
-		create_static_library(output_file,
-			"#{output_dir}/boost/*.o " <<
-			"#{output_dir}/oxt/*.o")
+	file(output_file => object_files) do
+		sh "mkdir -p #{output_dir}"
+		create_static_library(output_file, object_files.join(' '))
 	end
 	
 	task "#{namespace}:clean" do
@@ -164,29 +227,36 @@ end
 ########## libev ##########
 
 if USE_VENDORED_LIBEV
+	LIBEV_SOURCE_DIR = File.expand_path("../ext/libev", File.dirname(__FILE__)) + "/"
 	LIBEV_CFLAGS = "-Iext/libev"
-	LIBEV_LIBS = "ext/libev/.libs/libev.a"
+	LIBEV_LIBS = LIBEV_OUTPUT_DIR + ".libs/libev.a"
 	
-	task :libev => "ext/libev/.libs/libev.a"
+	task :libev => LIBEV_OUTPUT_DIR + ".libs/libev.a"
 	
-	file "ext/libev/Makefile" => ["ext/libev/configure", "ext/libev/config.h.in", "ext/libev/Makefile.am"] do
-		sh "cd ext/libev && sh ./configure --disable-shared --enable-static"
+	dependencies = [
+		"ext/libev/configure",
+		"ext/libev/config.h.in",
+		"ext/libev/Makefile.am"
+	]
+	file LIBEV_OUTPUT_DIR + "Makefile" => dependencies do
+		sh "mkdir -p #{LIBEV_OUTPUT_DIR}" if !File.directory?(LIBEV_OUTPUT_DIR)
+		sh "cd #{LIBEV_OUTPUT_DIR} && sh #{LIBEV_SOURCE_DIR}configure --disable-shared --enable-static"
 	end
 	
 	libev_sources = Dir["ext/libev/{*.c,*.h}"]
-	file "ext/libev/.libs/libev.a" => ["ext/libev/Makefile"] + libev_sources do
-		sh "rm -f ext/libev/libev.la"
-		sh "cd ext/libev && make libev.la"
+	file LIBEV_OUTPUT_DIR + ".libs/libev.a" => [LIBEV_OUTPUT_DIR + "Makefile"] + libev_sources do
+		sh "rm -f #{LIBEV_OUTPUT_DIR}/libev.la"
+		sh "cd #{LIBEV_OUTPUT_DIR} && make libev.la"
 	end
 	
 	task :clean do
-		if File.exist?("ext/libev/Makefile")
-			sh "cd ext/libev && make maintainer-clean"
+		if File.exist?(LIBEV_OUTPUT_DIR + "Makefile")
+			sh "cd #{LIBEV_OUTPUT_DIR} && make maintainer-clean"
 		end
 	end
 else
-	LIBEV_CFLAGS = string_option('LIBEV_CFLAGS', '')
-	LIBEV_LIBS   = string_option('LIBEV_LIBS', '')
+	LIBEV_CFLAGS = string_option('LIBEV_CFLAGS', '-I/usr/include/libev')
+	LIBEV_LIBS   = string_option('LIBEV_LIBS', '-lev')
 	task :libev  # do nothing
 end
 
@@ -194,5 +264,5 @@ end
 ##############################
 
 
-LIBBOOST_OXT = define_libboost_oxt_task("common", "ext/common/libboost_oxt")
-LIBCOMMON    = define_common_library_task("common", "ext/common/libpassenger_common")
+LIBBOOST_OXT = define_libboost_oxt_task("common", COMMON_OUTPUT_DIR + "libboost_oxt")
+LIBCOMMON    = define_common_library_task("common", COMMON_OUTPUT_DIR + "libpassenger_common")

data/build/config.rb

@@ -1,18 +1,25 @@
 #  Phusion Passenger - http://www.modrails.com/
-#  Copyright (C) 2010  Phusion
+#  Copyright (c) 2010 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
-#  the Free Software Foundation; version 2 of the License.
+#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
+#  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:
 #
-#  You should have received a copy of the GNU General Public License along
-#  with this program; if not, write to the Free Software Foundation, Inc.,
-#  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#  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.
 
 OPTIMIZE = boolean_option("OPTIMIZE")
 CC       = string_option("CC", "gcc")

data/build/cplusplus_support.rb

@@ -47,6 +47,10 @@ def create_executable(target, sources, linkflags = "#{PlatformInfo.portability_c
 	sh "#{CXX} #{sources} -o #{target} #{linkflags}"
 end
 
+def create_c_executable(target, sources, linkflags = "#{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS} #{PlatformInfo.portability_ldflags} #{EXTRA_LDFLAGS}")
+	sh "#{CC} #{sources} -o #{target} #{linkflags}"
+end
+
 def create_shared_library(target, sources, flags = "#{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS} #{PlatformInfo.portability_ldflags} #{EXTRA_LDFLAGS}")
 	if RUBY_PLATFORM =~ /darwin/
 		shlib_flag = "-flat_namespace -bundle -undefined dynamic_lookup"

data/build/cxx_tests.rb

@@ -1,18 +1,25 @@
 #  Phusion Passenger - http://www.modrails.com/
-#  Copyright (C) 2008, 2009  Phusion
+#  Copyright (c) 2010 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
-#  the Free Software Foundation; version 2 of the License.
+#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
+#  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:
 #
-#  You should have received a copy of the GNU General Public License along
-#  with this program; if not, write to the Free Software Foundation, Inc.,
-#  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#  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.
 
 ### C++ components tests ###
 
@@ -169,10 +176,17 @@ TEST_CXX_OBJECTS = {
 		test/cxx/CachedFileStatTest.cpp
 		ext/common/Utils/CachedFileStat.hpp
 		ext/common/Utils/CachedFileStat.cpp),
+	'test/cxx/BufferedIOTest.o' => %w(
+		test/cxx/BufferedIOTest.cpp
+		ext/common/Utils/BufferedIO.h
+		ext/common/Utils/Timer.h),
 	'test/cxx/VariantMapTest.o' => %w(
 		test/cxx/VariantMapTest.cpp
 		ext/common/MessageChannel.h
 		ext/common/Utils/VariantMap.h),
+	'test/cxx/ProcessMetricsCollectorTest.o' => %w(
+		test/cxx/ProcessMetricsCollectorTest.cpp
+		ext/common/Utils/ProcessMetricsCollector.h),
 	'test/cxx/UtilsTest.o' => %w(
 		test/cxx/UtilsTest.cpp
 		ext/common/Utils.h),
@@ -182,7 +196,7 @@ TEST_CXX_OBJECTS = {
 }
 
 desc "Run unit tests for the Apache 2 and Nginx C++ components"
-task 'test:cxx' => ['test/cxx/CxxTestMain', :native_support] do
+task 'test:cxx' => ['test/cxx/CxxTestMain', 'test/support/allocate_memory', :native_support] do
         if ENV['GROUPS'].to_s.empty?
 	        sh "cd test && ./cxx/CxxTestMain"
         else

data/build/documentation.rb

@@ -1,18 +1,25 @@
 #  Phusion Passenger - http://www.modrails.com/
-#  Copyright (C) 2008, 2009  Phusion
+#  Copyright (c) 2010 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
-#  the Free Software Foundation; version 2 of the License.
+#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
+#  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:
 #
-#  You should have received a copy of the GNU General Public License along
-#  with this program; if not, write to the Free Software Foundation, Inc.,
-#  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#  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.
 
 ASCIIDOC_FLAGS = "-a toc -a numbered -a toclevels=3 -a icons"
 DOXYGEN = 'doxygen'

data/build/integration_tests.rb

@@ -1,18 +1,25 @@
 #  Phusion Passenger - http://www.modrails.com/
-#  Copyright (C) 2008, 2009  Phusion
+#  Copyright (c) 2010 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
-#  the Free Software Foundation; version 2 of the License.
+#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
+#  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:
 #
-#  You should have received a copy of the GNU General Public License along
-#  with this program; if not, write to the Free Software Foundation, Inc.,
-#  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#  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.
 
 ### Integration tests ###
 

data/build/misc.rb

@@ -1,18 +1,25 @@
 #  Phusion Passenger - http://www.modrails.com/
-#  Copyright (C) 2010  Phusion
+#  Copyright (c) 2010 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
-#  the Free Software Foundation; version 2 of the License.
+#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
+#  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:
 #
-#  You should have received a copy of the GNU General Public License along
-#  with this program; if not, write to the Free Software Foundation, Inc.,
-#  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#  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.
 
 desc "Run 'sloccount' to see how much code Passenger has"
 task :sloccount do