passenger 2.1.3 → 2.2.0

data/lib/phusion_passenger/events.rb

@@ -1,20 +1,25 @@
 #  Phusion Passenger - http://www.modrails.com/
-#  Copyright (C) 2009  Phusion
+#  Copyright (c) 2008, 2009 Phusion
 #
-#  Phusion Passenger is a trademark of Hongli Lai & Ninh Bui.
+#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
-#  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.
+#  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:
 #
-#  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.
+#  The above copyright notice and this permission notice shall be included in
+#  all copies or substantial portions of the Software.
 #
-#  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 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.
 
 module PhusionPassenger
 	@@event_starting_worker_process = []

data/lib/phusion_passenger/exceptions.rb

@@ -1,20 +1,25 @@
 #  Phusion Passenger - http://www.modrails.com/
-#  Copyright (C) 2008  Phusion
+#  Copyright (c) 2008, 2009 Phusion
 #
-#  Phusion Passenger is a trademark of Hongli Lai & Ninh Bui.
+#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
-#  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.
+#  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:
 #
-#  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.
+#  The above copyright notice and this permission notice shall be included in
+#  all copies or substantial portions of the Software.
 #
-#  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 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.
 
 module PhusionPassenger
 

data/lib/phusion_passenger/html_template.rb

@@ -1,20 +1,25 @@
 #  Phusion Passenger - http://www.modrails.com/
-#  Copyright (C) 2008  Phusion
+#  Copyright (c) 2008, 2009 Phusion
 #
-#  Phusion Passenger is a trademark of Hongli Lai & Ninh Bui.
+#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
-#  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.
+#  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:
 #
-#  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.
+#  The above copyright notice and this permission notice shall be included in
+#  all copies or substantial portions of the Software.
 #
-#  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 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.
 
 require 'erb'
 

data/lib/phusion_passenger/message_channel.rb

@@ -1,20 +1,25 @@
 #  Phusion Passenger - http://www.modrails.com/
-#  Copyright (C) 2008  Phusion
+#  Copyright (c) 2008, 2009 Phusion
 #
-#  Phusion Passenger is a trademark of Hongli Lai & Ninh Bui.
+#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
-#  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.
+#  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:
 #
-#  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.
+#  The above copyright notice and this permission notice shall be included in
+#  all copies or substantial portions of the Software.
 #
-#  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 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.
 
 module PhusionPassenger
 

data/lib/phusion_passenger/packaging.rb

@@ -0,0 +1,39 @@
+#  Phusion Passenger - http://www.modrails.com/
+#  Copyright (c) 2008, 2009 Phusion
+#
+#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+#
+#  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.
+
+module PhusionPassenger
+	LIBDIR = File.expand_path(File.join(File.dirname(__FILE__), ".."))
+	
+	# Returns whether this Phusion Passenger installation is packaged
+	# using the OS's native package management system, i.e. as opposed
+	# to being installed from source or with RubyGems.
+	def self.natively_packaged?
+		return !File.exist?("#{LIBDIR}/../Rakefile")
+	end
+	
+	if natively_packaged?
+		DOCDIR = "/usr/share/doc/phusion_passenger"
+	else
+		DOCDIR = File.expand_path(File.join(LIBDIR, "..", "doc"))
+	end
+end

data/lib/phusion_passenger/platform_info.rb

@@ -1,20 +1,25 @@
 #  Phusion Passenger - http://www.modrails.com/
-#  Copyright (C) 2008, 2009  Phusion
+#  Copyright (c) 2008, 2009 Phusion
 #
-#  Phusion Passenger is a trademark of Hongli Lai & Ninh Bui.
+#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
-#  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.
+#  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:
 #
-#  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.
+#  The above copyright notice and this permission notice shall be included in
+#  all copies or substantial portions of the Software.
 #
-#  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 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.
 
 require 'rbconfig'
 
@@ -374,7 +379,7 @@ public
 	end
 	
 	# The C compiler flags that are necessary to compile an Apache module.
-	# Includes portability_cflags.
+	# Possibly includes APR and APU compiler flags.
 	def self.apache2_module_cflags(with_apr_flags = true)
 		flags = ["-fPIC"]
 		if with_apr_flags
@@ -398,23 +403,44 @@ public
 			flags << apxs2_flags
 		end
 		if !httpd.nil? && RUBY_PLATFORM =~ /darwin/
-			# Add possible universal binary flags.
-			architectures = []
-			`file "#{httpd}"`.split("\n").grep(/for architecture/).each do |line|
-				line =~ /for architecture (.*?)\)/
-				architectures << "-arch #{$1}"
+			# The default Apache install on OS X is a universal binary.
+			# Figure out which architectures it's compiled for and do the same
+			# thing for mod_passenger. We use the 'file' utility to do this.
+			#
+			# Running 'file' on the Apache executable usually outputs something
+			# like this:
+			#
+			#   /usr/sbin/httpd: Mach-O universal binary with 4 architectures
+			#   /usr/sbin/httpd (for architecture ppc7400):     Mach-O executable ppc
+			#   /usr/sbin/httpd (for architecture ppc64):       Mach-O 64-bit executable ppc64
+			#   /usr/sbin/httpd (for architecture i386):        Mach-O executable i386
+			#   /usr/sbin/httpd (for architecture x86_64):      Mach-O 64-bit executable x86_64
+			#
+			# But on some machines, it may output just:
+			#
+			#   /usr/sbin/httpd: Mach-O fat file with 4 architectures
+			#
+			# (http://code.google.com/p/phusion-passenger/issues/detail?id=236)
+			output = `file "#{httpd}"`.strip
+			if output =~ /Mach-O fat file/ && output !~ /for architecture/
+				architectures = ["-arch i386 -arch ppc -arch x86_64 -arch ppc64"]
+			else
+				architectures = []
+				output.split("\n").grep(/for architecture/).each do |line|
+					line =~ /for architecture (.*?)\)/
+					architectures << "-arch #{$1}"
+				end
 			end
-			flags << architectures.join(' ')
+			flags << architectures.compact.join(' ')
 		end
-		flags << portability_cflags
 		return flags.compact.join(' ').strip
 	end
 	memoize :apache2_module_cflags
 	
 	# Linker flags that are necessary for linking an Apache module.
-	# Includes portability_ldflags
+	# Possibly includes APR and APU linker flags.
 	def self.apache2_module_ldflags
-		flags = "-fPIC #{apr_libs} #{apu_libs} #{portability_ldflags}"
+		flags = "-fPIC #{apr_libs} #{apu_libs}"
 		flags.strip!
 		return flags
 	end

data/lib/phusion_passenger/rack/application_spawner.rb

@@ -1,24 +1,32 @@
 #  Phusion Passenger - http://www.modrails.com/
-#  Copyright (C) 2008  Phusion
+#  Copyright (c) 2008, 2009 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.
 
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../../../vendor/rack-0.9.1/lib"))
 require 'rack'
 
 require 'socket'
 require 'phusion_passenger/application'
+require 'phusion_passenger/events'
 require 'phusion_passenger/message_channel'
 require 'phusion_passenger/abstract_request_handler'
 require 'phusion_passenger/utils'
@@ -96,11 +104,14 @@ private
 				channel.send_io(writer)
 				writer.close
 				channel.close
+				
+				PhusionPassenger.call_event(:starting_worker_process)
 				handler.main_loop
 			ensure
 				channel.close rescue nil
 				writer.close rescue nil
 				handler.cleanup rescue nil
+				PhusionPassenger.call_event(:stopping_worker_process)
 			end
 		end
 	end

data/lib/phusion_passenger/rack/request_handler.rb

@@ -1,18 +1,25 @@
 #  Phusion Passenger - http://www.modrails.com/
-#  Copyright (C) 2008  Phusion
+#  Copyright (c) 2008, 2009 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.
 
 require 'phusion_passenger/abstract_request_handler'
 module PhusionPassenger
@@ -55,7 +62,9 @@ protected
 		env[RACK_MULTIPROCESS] = true
 		env[RACK_RUN_ONCE]     = false
 		env[SCRIPT_NAME]     ||= ''
-		env[PATH_INFO].sub!(/^#{Regexp.escape(env[SCRIPT_NAME])}/, "")
+		if ENV.has_key?(PATH_INFO)
+			env[PATH_INFO].sub!(/^#{Regexp.escape(env[SCRIPT_NAME])}/, "")
+		end
 		if env[HTTPS] == YES || env[HTTPS] == ON || env[HTTPS] == ONE
 			env[RACK_URL_SCHEME] = HTTPS_DOWNCASE
 		else

data/lib/phusion_passenger/railz/application_spawner.rb

@@ -1,20 +1,25 @@
 #  Phusion Passenger - http://www.modrails.com/
-#  Copyright (C) 2008  Phusion
+#  Copyright (c) 2008, 2009 Phusion
 #
-#  Phusion Passenger is a trademark of Hongli Lai & Ninh Bui.
+#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
-#  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.
+#  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:
 #
-#  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.
+#  The above copyright notice and this permission notice shall be included in
+#  all copies or substantial portions of the Software.
 #
-#  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 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.
 
 require 'rubygems'
 require 'socket'
@@ -82,13 +87,8 @@ class ApplicationSpawner < AbstractServer
 	# All other options will be passed on to RequestHandler.
 	def initialize(app_root, options = {})
 		super()
-		begin
-			@app_root = normalize_path(app_root)
-		rescue SystemCallError => e
-			raise InvalidPath, e.message
-		rescue InvalidPath
-			raise
-		end
+		@app_root = app_root
+		@canonicalized_app_root = canonicalize_path(app_root)
 		@options = sanitize_spawn_options(options)
 		@lower_privilege = @options["lower_privilege"]
 		@lowest_user     = @options["lowest_user"]
@@ -230,7 +230,7 @@ protected
 	
 private
 	def preload_application
-		Object.const_set(:RAILS_ROOT, @app_root)
+		Object.const_set(:RAILS_ROOT, @canonicalized_app_root)
 		if defined?(::Rails::Initializer)
 			::Rails::Initializer.run(:set_load_path)
 			
@@ -275,9 +275,9 @@ private
 		if !defined?(Dispatcher)
 			require 'dispatcher'
 		end
-		if File.exist?('app/controllers/application_controller.rb')
+		begin
 			require_dependency 'application_controller'
-		else
+		rescue LoadError
 			require_dependency 'application'
 		end
 		
@@ -287,7 +287,7 @@ private
 		#   to do that again.
 		if GC.copy_on_write_friendly? && !::Rails::Initializer.respond_to?(:load_application_classes)
 			Dir.glob('app/{models,controllers,helpers}/*.rb').each do |file|
-				require_dependency normalize_path(file)
+				require_dependency canonicalize_path(file)
 			end
 		end
 	end