passenger 2.1.3 → 2.2.0

data/lib/phusion_passenger/railz/framework_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 'phusion_passenger/abstract_server'
@@ -148,7 +153,6 @@ class FrameworkSpawner < AbstractServer
 	# - ApplicationSpawner::Error: The ApplicationSpawner server exited unexpectedly.
 	# - FrameworkSpawner::Error: The FrameworkSpawner server exited unexpectedly.
 	def spawn_application(app_root, options = {})
-		app_root = normalize_path(app_root)
 		assert_valid_app_root(app_root)
 		options = sanitize_spawn_options(options)
 		options["app_root"] = app_root
@@ -200,7 +204,7 @@ class FrameworkSpawner < AbstractServer
 		if app_root.nil?
 			server.write("reload")
 		else
-			server.write("reload", normalize_path(app_root))
+			server.write("reload", app_root)
 		end
 	rescue SystemCallError, IOError, SocketError
 		raise Error, "The framework spawner server exited unexpectedly"

data/lib/phusion_passenger/railz/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'
 require 'phusion_passenger/railz/cgi_fixed'

data/lib/phusion_passenger/simple_benchmarking.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.
 
 class Object # :nodoc:
 	@@benchmark_results = {}

data/lib/phusion_passenger/spawn_manager.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 'phusion_passenger/abstract_server'
 require 'phusion_passenger/abstract_server_collection'
@@ -180,12 +185,6 @@ class SpawnManager < AbstractServer
 	#
 	# Raises AbstractServer::SpawnError if something went wrong.
 	def reload(app_root = nil)
-		if app_root
-			begin
-				app_root = normalize_path(app_root)
-			rescue InvalidPath
-			end
-		end
 		@spawners.synchronize do
 			if app_root
 				# Delete associated ApplicationSpawner.
@@ -227,7 +226,6 @@ private
 				framework_version = Application.detect_framework_version(app_root)
 			end
 			if framework_version.nil? || framework_version == :vendor
-				app_root = normalize_path(app_root)
 				key = "app:#{app_root}"
 				create_spawner = proc do
 					Railz::ApplicationSpawner.new(app_root, options)
@@ -241,7 +239,6 @@ private
 				spawner_timeout = options["framework_spawner_timeout"]
 			end
 		else
-			app_root = normalize_path(app_root)
 			key = "app:#{app_root}"
 			create_spawner = proc do
 				Railz::ApplicationSpawner.new(app_root, options)

data/lib/phusion_passenger/templates/nginx/ask_for_extra_configure_flags.txt.erb

@@ -0,0 +1,8 @@
+<banner>Extra Nginx configure options</banner>
+
+If you want to pass extra arguments to the Nginx 'configure' script, then
+please specify them. If not, then specify nothing and press Enter.
+
+If you specify nothing then the 'configure' script will be run as follows:
+
+  <b><%= @command %></b>

data/lib/phusion_passenger/templates/nginx/cannot_write_to_dir.txt.erb

@@ -0,0 +1,11 @@
+<red>Permission problems</red>
+
+This installer must be able to write to the following directory:
+
+  <b><%= @dir %></b>
+
+But it can't do that, despite the fact that it's running as root. There's
+probably a permission problem, or (if you're running on a
+RedHat/CentOS-based Linux distribution) SELinux might be interfering.
+Please fix the permissions for the aforementioned directory and/or disable
+SELinux, and re-run this installer.

data/lib/phusion_passenger/templates/nginx/config_snippets.txt.erb

@@ -0,0 +1,17 @@
+<banner>Nginx with Passenger support was successfully installed.</banner>
+
+Please edit your Nginx configuration file (probably <b><%= @config_file %></b>),
+and set the <b>passenger_root</b> and <b>passenger_ruby</b> configuration options in the
+<b>'http'</b> block, like this:
+
+  <b>http {
+      ...
+      passenger_root <%= @passenger_root %>;
+      passenger_ruby <%= @ruby %>;
+      ...
+  }</b>
+
+After you (re)start Nginx, you are ready to deploy any number of Ruby on Rails
+applications on Nginx.
+
+<b>Press ENTER to continue.</b>

data/lib/phusion_passenger/templates/nginx/config_snippets_inserted.txt.erb

@@ -0,0 +1,20 @@
+<banner>Nginx with Passenger support was successfully installed.</banner>
+
+The Nginx configuration file (<b><%= @config_file %></b>)
+must contain the correct configuration options in order for Phusion Passenger
+to function correctly.
+
+<green>This installer has already modified the configuration file for you!</green> The
+following configuration snippet was inserted:
+
+  <b>http {
+      ...
+      passenger_root <%= @passenger_root %>;
+      passenger_ruby <%= @ruby %>;
+      ...
+  }</b>
+
+After you start Nginx, you are ready to deploy any number of Ruby on Rails
+applications on Nginx.
+
+<b>Press ENTER to continue.</b>

data/lib/phusion_passenger/templates/nginx/confirm_extra_configure_flags.txt.erb

@@ -0,0 +1,5 @@
+<banner>Confirm configure flags</banner>
+
+The Nginx configure script will be run as follows:
+
+  <b><%= @command %></b>

data/lib/phusion_passenger/templates/nginx/deployment_example.txt.erb

@@ -0,0 +1,22 @@
+<banner>Deploying a Ruby on Rails application: an example</banner>
+
+Suppose you have a Ruby on Rails application in <b>/somewhere</b>. Add a <b>server</b> block
+to your Nginx configuration file, set its <b>root</b> to <b>/somewhere/public</b>, and set
+<b>'passenger_enabled on'</b>, like this:
+<b>
+   server {
+      listen 80;
+      server_name www.yourhost.com;
+      root /somewhere/public;   # <--- be sure to point to 'public'!
+      passenger_enabled on;
+   }
+</b>
+And that's it! You may also want to check the Users Guide for security and
+optimization tips and other useful information:
+
+  <yellow><%= @users_guide %></yellow>
+
+Enjoy Phusion Passenger, a product of Phusion (<b><%= @phusion_website %></b>) :-)
+<b><%= @passenger_website %></b>
+
+Phusion Passenger is a trademark of Hongli Lai & Ninh Bui.

data/lib/phusion_passenger/templates/nginx/pcre_could_not_be_downloaded.txt.erb

@@ -0,0 +1,11 @@
+<red><b>PCRE could not be downloaded</b></red>
+
+Nginx requires PCRE for its rewrite module, so this installer will attempt to
+install Nginx without the rewrite module.
+
+If you want to make use of Nginx's rewrite module, please install PCRE manually
+by downloading it from:
+
+  http://www.pcre.org/
+
+Press ENTER to continue, or Ctrl-C to abort.

data/lib/phusion_passenger/templates/nginx/pcre_could_not_be_extracted.txt.erb

@@ -0,0 +1,11 @@
+<red><b>The PCRE source tarball could not be extracted</b></red>
+
+Nginx requires PCRE for its rewrite module, so this installer will attempt to
+install Nginx without the rewrite module.
+
+If you want to make use of Nginx's rewrite module, please install PCRE manually
+by downloading it from:
+
+  http://www.pcre.org/
+
+Press ENTER to continue, or Ctrl-C to abort.

data/lib/phusion_passenger/templates/nginx/possible_solutions_for_compilation_and_installation_problems.txt.erb

@@ -0,0 +1,11 @@
+<red>It looks like something went wrong</red>
+
+Please read our Users guide for troubleshooting tips:
+
+   <b><%= @users_guide %></b>
+
+If that doesn't help, please use our support facilities at:
+
+   <b><%= @passenger_website %></b>
+
+We'll do our best to help you.

data/lib/phusion_passenger/templates/nginx/possible_solutions_for_download_and_extraction_problems.txt.erb

@@ -0,0 +1,20 @@
+<red><b>Unable to download or extract Nginx source tarball</b></red>
+
+Possible reasons:
+
+ <b>* You are not connected to the Internet.</b>
+   If this is the case, then please connect to the Internet and try again.
+
+ <b>* The URL that this installer tried to download from no longer exists.</b>
+   If this is the case, then please download and extract the Nginx source
+   manually. Then restart this installer, and choose option 2 ("No: I want
+   to customize my Nginx installation").
+
+ <b>* The download was corrupted.</b>
+   Please re-run this installer; it will re-download Nginx. If this still
+   fails, then please download and extract the Nginx source manually. Then
+   restart this installer, and choose option 2 ("No: I want to customize my
+   Nginx installation").
+
+ <b>* This installer is not able to write to /tmp.</b>
+   Please fix the permissions for this directory, or run this installer as <b>root</b>.

data/lib/phusion_passenger/templates/nginx/query_download_and_install.txt.erb

@@ -0,0 +1,21 @@
+<banner>Automatically download and install Nginx?</banner>
+
+Nginx doesn't support loadable modules such as some other web servers do,
+so in order to install Nginx with Passenger support, it must be recompiled.
+
+Do you want this installer to download, compile and install Nginx for you?
+
+ <yellow><b>1. Yes: download, compile and install Nginx for me. (recommended)</b></yellow>
+    The easiest way to get started. A stock Nginx <%= @nginx_version %> with Passenger
+    support, but with no other additional third party modules, will be
+    installed for you to a directory of your choice.
+
+ <yellow><b>2. No: I want to customize my Nginx installation. (for advanced users)</b></yellow>
+    Choose this if you want to compile Nginx with more third party modules
+    besides Passenger, or if you need to pass additional options to Nginx's
+    'configure' script. This installer will  1) ask you for the location of
+    the Nginx source code,  2) run the 'configure' script according to your
+    instructions, and  3) run 'make install'.
+
+Whichever you choose, if you already have an existing Nginx configuration file,
+then it will be preserved.

data/lib/phusion_passenger/templates/nginx/run_installer_as_root.txt.erb

@@ -0,0 +1,8 @@
+<red>Permission problems</red>
+
+This installer must be able to write to the following directory:
+
+  <b><%= @dir %></b>
+
+But it can't do that, because you're running the installer as <b><%= `whoami`.strip %></b>.
+Please re-run this installer as <b>root</b>.

data/lib/phusion_passenger/templates/nginx/welcome.txt.erb

@@ -0,0 +1,15 @@
+<banner>Welcome to the Phusion Passenger Nginx module installer, v<%= @version %>.</banner>
+
+This installer will guide you through the entire installation process. It
+shouldn't take more than 5 minutes in total.
+
+Here's what you can expect from the installation process:
+
+ <b>1.</b> This installer will compile and install Nginx with Passenger support.
+ <b>2.</b> You'll learn how to configure Passenger in Nginx.
+ <b>3.</b> You'll learn how to deploy a Ruby on Rails application.
+
+Don't worry if anything goes wrong. This installer will advise you on how to
+solve any problems.
+
+<b>Press Enter to continue, or Ctrl-C to abort.</b>

data/lib/phusion_passenger/utils.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 'thread'
@@ -35,14 +40,14 @@ module PhusionPassenger
 # Utility functions.
 module Utils
 protected
-	# Return the absolute version of +path+. This path is guaranteed to
+	# Return the canonicalized version of +path+. This path is guaranteed to
 	# to be "normal", i.e. it doesn't contain stuff like ".." or "/",
-	# and it correctly respects symbolic links.
+	# and it fully resolves symbolic links.
 	#
 	# Raises SystemCallError if something went wrong. Raises ArgumentError
 	# if +path+ is nil. Raises InvalidPath if +path+ does not appear
 	# to be a valid path.
-	def normalize_path(path)
+	def canonicalize_path(path)
 		raise ArgumentError, "The 'path' argument may not be nil" if path.nil?
 		return Pathname.new(path).realpath.to_s
 	rescue Errno::ENOENT => e