passenger 4.0.17 → 4.0.18

data.tar.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJSLtLBAAoJECrHRaUKISqMKaMIAIcjl+ySg+pTg2eXZ/VBZM1l
-go4SMxBUG+vBZvwnRUnFKPi1kR2uWcY9+kWnw92gMC0iRAQUKO/rgroN3FE4Igti
-mF9OPKGkacZUdzTHZxP60KbzWqT9GcAWiixC+6mX5WuzGUtzGpJUkmCWzghbhhxs
-baqJA86yn3RVF4qZ1weYBSIyZZJi2boC8Z/qEXW/RR0ebbcZ2SZj3JvcHEFY7sxi
-0HmlLC+XifIJMEoubnQQeAz7urgTf5aVGn9nDYHu5ccuFGp1CEI81mlki35A2Q2f
-dJoagg6cdh46RYHLvYnAYAecWWL5m6zvLk+nSWTX82jW0Ak7DTSlUQc/LS9lNNc=
-=8iM+
+iQEcBAABAgAGBQJSOKPwAAoJECrHRaUKISqMIWsIAI0gIk9gSi5obV1E6ZzujCtb
+caa6QFENT8p9GY1w6V1vy1j8IX5fH4lVp5NpVpSfLUpebER0NLWChF53xSQ7pt2x
+ai9grp2EWke0mc/U8xpV1b/JdP3+6aAaynk0Gn6aqAz8Oj4Z1L3KL6zaaG8p8HX/
+wmlyjbkXvVxakyk+JIldGjZIsZIskEq2Z9uKfUGj4JVFHSq06d2g3u8tM8hA8QpY
+6DmXvd2d/VV4S/g3UsvDqh69wKIEX43k4PTIgsyOypThkkoEiXcFMniBtnohPTfB
+ShqktUEJUUsTPPtuKaIw/LnrLhE8HscgSn6kSDpsLeLgKDO5P9DIJVEiYQ2V4mI=
+=UqRe
 -----END PGP SIGNATURE-----

data/NEWS

@@ -1,3 +1,24 @@
+Release 4.0.18
+--------------
+
+ * The Enterprise variant of Phusion Passenger Standalone now supports
+   customizing the concurrency model and thread count from the command line.
+ * On Nginx, the Enterprise license is now only checked if Phusion Passenger
+   is enabled in Nginx. This allows you to deploy Nginx binaries, that have
+   Phusion Passenger Enterprise compiled in, to servers that are not
+   actually running Phusion Passenger Enterprise.
+ * Fixed a performance bug in the Union Station support code. In certain cases
+   where a lot of data must be sent to Union Station, the code is now over
+   100 times faster.
+ * `passenger-status --show=union_station` now displays all clients that
+   are connected to the LoggingAgent.
+ * Added a workaround for Heroku so that exited processes are properly detected
+   as such.
+ * When using Phusion Passenger Standalone with Foreman, pressing Ctrl-C
+   in Foreman no longer results in runaway Nginx processes.
+ * Fixed backtraces in the Apache module.
+
+
 Release 4.0.17
 --------------
 

data/bin/passenger

@@ -22,6 +22,8 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
+## Magic comment: set locations.ini ##
+
 source_root = File.expand_path("..", File.dirname(__FILE__))
 $LOAD_PATH.unshift("#{source_root}/lib")
 require 'phusion_passenger'

data/bin/passenger-config

@@ -22,6 +22,8 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
+## Magic comment: set locations.ini ##
+
 source_root = File.expand_path("..", File.dirname(__FILE__))
 $LOAD_PATH.unshift("#{source_root}/lib")
 require 'phusion_passenger'

data/bin/passenger-install-apache2-module

@@ -22,6 +22,8 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
+## Magic comment: set locations.ini ##
+
 PASSENGER_ROOT = File.expand_path(File.dirname(__FILE__) + "/..")
 $LOAD_PATH.unshift("#{PASSENGER_ROOT}/lib")
 require 'phusion_passenger'

data/bin/passenger-install-nginx-module

@@ -22,6 +22,8 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
+## Magic comment: set locations.ini ##
+
 source_root = File.expand_path("..", File.dirname(__FILE__))
 $LOAD_PATH.unshift("#{source_root}/lib")
 require 'phusion_passenger'

data/bin/passenger-memory-stats

@@ -22,6 +22,8 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
+## Magic comment: set locations.ini ##
+
 source_root = File.expand_path("..", File.dirname(__FILE__))
 $LOAD_PATH.unshift("#{source_root}/lib")
 require 'phusion_passenger'

data/bin/passenger-status

@@ -22,6 +22,8 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
+## Magic comment: set locations.ini ##
+
 source_root = File.expand_path("..", File.dirname(__FILE__))
 $LOAD_PATH.unshift("#{source_root}/lib")
 require 'phusion_passenger'

data/build/debian.rb

@@ -161,7 +161,9 @@ end
 def create_debian_binary_package_task(distribution, arch)
 	task "debian:binary_package:#{distribution}_#{arch}" => 'debian:binary_packages:check' do
 		base_name = "#{DEBIAN_NAME}_#{PACKAGE_VERSION}-1~#{distribution}1"
-		sh "cd #{PKG_DIR}/official && pbuilder-dist #{distribution} #{arch} build #{base_name}.dsc"
+		sh "cd #{PKG_DIR}/official && " +
+			"pbuilder-dist #{distribution} #{arch} build #{base_name}.dsc " +
+			"2>&1 | tee #{PKG_DIR}/official/passenger_#{distribution}_#{arch}.log"
 	end
 end
 

data/build/packaging.rb

@@ -53,6 +53,24 @@ def recursive_copy_files(files, destination_dir, preprocess = false, variables =
 	end
 end
 
+def word_wrap(text, max = 72)
+	while index = (lines = text.split("\n")).find_index{ |line| line.size > max }
+		line = lines[index]
+		pos = max
+		while pos >= 0 && line[pos..pos] != " "
+			pos -= 1
+		end
+		if pos < 0
+			raise "Cannot wrap line: #{line}"
+		else
+			lines[index] = line[0 .. pos - 1]
+			lines.insert(index + 1, line[pos + 1 .. -1])
+			text = lines.join("\n")
+		end
+	end
+	return text
+end
+
 
 task :clobber => 'package:clean'
 
@@ -140,6 +158,12 @@ task 'package:release' => ['package:set_official', 'package:gem', 'package:tarba
 				abort("Unable to substitute Homebrew formula tarball filename")
 			formula.gsub!(/sha1 .*/, "sha1 '#{sha1}'") ||
 				abort("Unable to substitute Homebrew formula SHA-1")
+			necessary_dirs = ORIG_TARBALL_FILES.call.map{ |filename| filename.split("/").first }.uniq
+			necessary_dirs -= PhusionPassenger::Packaging::HOMEBREW_EXCLUDE
+			necessary_dirs += ["buildout"]
+			necessary_dirs_str = word_wrap(necessary_dirs.inspect).split("\n").join("\n      ")
+			formula.sub!(/necessary_files = .*?\]/m, "necessary_files = Dir#{necessary_dirs_str}") ||
+				abort("Unable to substitute file whitelist")
 			File.open("/tmp/homebrew/Library/Formula/passenger.rb", "w") do |f|
 				f.write(formula)
 			end
@@ -149,7 +173,7 @@ task 'package:release' => ['package:set_official', 'package:gem', 'package:tarba
 
 			puts "Initiating building of Debian packages"
 			command = "cd /srv/passenger_apt_automation && " +
-				"chpst -L /tmp/passenger_apt_automation.lock " +
+				"chpst -l /tmp/passenger_apt_automation.lock " +
 				"/tools/silence-unless-failed " +
 				"./new_release https://github.com/phusion/passenger.git passenger.repo passenger.apt release-#{version}"
 			sh "ssh psg_apt_automation@juvia-helper.phusion.nl at now <<<'#{command}'"
@@ -171,7 +195,7 @@ task 'package:release' => ['package:set_official', 'package:gem', 'package:tarba
 			puts "Initiating building of Debian packages"
 			git_url = `git config remote.origin.url`.strip
 			command = "cd /srv/passenger_apt_automation && " +
-				"chpst -L /tmp/passenger_apt_automation.lock " +
+				"chpst -l /tmp/passenger_apt_automation.lock " +
 				"/tools/silence-unless-failed " +
 				"./new_release #{git_url} passenger-enterprise.repo passenger-enterprise.apt enterprise-#{version}"
 			sh "ssh psg_apt_automation@juvia-helper.phusion.nl at now <<<'#{command}'"
@@ -267,6 +291,16 @@ task 'package:clean' do
 	sh "rm -f pkg/#{basename}.{gem,gem.asc,tar.gz,tar.gz.asc}"
 end
 
+def change_shebang(filename, value)
+	contents = File.open(filename, "r") do |f|
+		f.read
+	end
+	contents.gsub!(/\A#\!.+$/, "#!#{value}")
+	File.open(filename, "w") do |f|
+		f.write(contents)
+	end
+end
+
 desc "Create a fakeroot, useful for building native packages"
 task :fakeroot => [:apache2, :nginx, :doc] do
 	require 'rbconfig'
@@ -357,12 +391,18 @@ task :fakeroot => [:apache2, :nginx, :doc] do
 	sh "mkdir -p #{fake_bindir}"
 	Packaging::USER_EXECUTABLES.each do |exe|
 		sh "cp bin/#{exe} #{fake_bindir}/"
+		if !Packaging::EXECUTABLES_WITH_FREE_RUBY.include?(exe)
+			change_shebang("#{fake_bindir}/#{exe}", "/usr/bin/ruby")
+		end
 	end
 	
 	# Superuser binaries
 	sh "mkdir -p #{fake_sbindir}"
 	Packaging::SUPER_USER_EXECUTABLES.each do |exe|
 		sh "cp bin/#{exe} #{fake_sbindir}/"
+		if !Packaging::EXECUTABLES_WITH_FREE_RUBY.include?(exe)
+			change_shebang("#{fake_sbindir}/#{exe}", "/usr/bin/ruby")
+		end
 	end
 	
 	# Apache 2 module

data/build/preprocessor.rb

@@ -183,12 +183,18 @@ private
 		"raring"   => "13.04",
 		"saucy"    => "13.10"
 	}
+	DEBIAN_DISTRIBUTIONS = {
+		"squeeze"  => "20110206",
+		"wheezy"   => "20130504"
+	}
 
 	# Provides the DSL that's accessible within.
 	class Evaluator
 		def _infer_distro_table(name)
 			if UBUNTU_DISTRIBUTIONS.has_key?(name)
 				return UBUNTU_DISTRIBUTIONS
+			elsif DEBIAN_DISTRIBUTIONS.has_key?(name)
+				return DEBIAN_DISTRIBUTIONS
 			end
 		end
 
@@ -207,6 +213,7 @@ private
 				table2 = _infer_distro_table(name)
 				raise "Distribution name #{@distribution.inspect} not recognized" if !table1
 				raise "Distribution name #{name.inspect} not recognized" if !table2
+				return false if table1 != table2
 				v1 = table1[@distribution]
 				v2 = table2[name]
 				

data/debian.template/control.template

@@ -8,9 +8,9 @@ Build-Depends: debhelper (>= 7.0.50~), rake,
  ruby1.9.1, ruby1.9.1-dev,
  apache2-mpm-worker | apache2-mpm, apache2-threaded-dev,
 #if is_distribution?('<= lucid')
-	 rubygems1.9,
+     rubygems1.9,
 #endif
-#if is_distribution?('>= precise')
+#if is_distribution?('>= precise') || is_distribution?('>= wheezy')
      libev-dev (>= 1:4.0.0),
 #endif
  libapr1-dev, libcurl4-openssl-dev
@@ -23,7 +23,13 @@ XS-Ruby-Versions: all
 Package: passenger
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
- rubygems (>= 1.2), ruby-rack, ruby-daemon-controller
+ rubygems (>= 1.2),
+#if is_distribution?('<= lucid') || is_distribution?('<= squeeze')
+     librack-ruby,
+#else
+     ruby-rack,
+#endif
+ ruby-daemon-controller
 Recommends: passenger-doc (= ${binary:Version}), passenger-dev (= ${binary:Version}),
  crash-watch
 Suggests: python

data/debian.template/rules.template

@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 # export DH_VERBOSE=1
 
-#if is_distribution?('>= precise')
+#if is_distribution?('>= precise') || is_distribution?('>= wheezy')
     export USE_VENDORED_LIBEV=false
 #endif
 
@@ -31,6 +31,7 @@ override_dh_auto_install:
 	# Merge Ruby 1.8 and 1.9 files into a single directory.
 	cp -a pkg/fakeroot1.8/* debian/tmp/
 	cp -a pkg/fakeroot1.9.1/* debian/tmp/
+	sed -i 's|## Magic comment: set locations\.ini ##|ENV["PASSENGER_LOCATION_CONFIGURATION_FILE"] = "/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini"|' debian/tmp/usr/bin/* debian/tmp/usr/sbin/*
 	touch debian/tmp/usr/share/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>/release.txt
 
 override_dh_auto_clean:

data/doc/Users guide Apache.idmap.txt

@@ -26,7 +26,11 @@
 
 2.3. Generic installation, upgrade and downgrade method: via tarball	=>	installing-via-the-source-tarball-1cgxrqc
 
-2.4. Installing or upgrading on Debian 6 or Ubuntu	=>	installing-or-upgrading-on-ubuntu-1xg22xs
+2.4. Installing or upgrading on Debian or Ubuntu	=>	installing-or-upgrading-on-ubuntu-1xg22xs
+
+2.4.1. Adding our APT repository	=>	adding-our-apt-repository-1l8plxk
+
+2.4.2. Installing packages	=>	installing-packages-1jxn722
 
 2.5. Installing or upgrading on Red Hat, Fedora, CentOS or ScientificLinux	=>	installing-or-upgrading-on-red-hat-fedora-centos-or-scientificlinux-1y5ie8b
 

data/doc/Users guide Nginx.idmap.txt

@@ -26,7 +26,11 @@
 
 2.3. Generic installation, upgrade and downgrade method: via tarball	=>	generic-installation-upgrade-and-downgrade-method-via-tarball-2gkx43
 
-2.4. Installing or upgrading on Debian 6 or Ubuntu	=>	installing-or-upgrading-on-ubuntu-fw5fvp
+2.4. Installing or upgrading on Debian or Ubuntu	=>	installing-or-upgrading-on-ubuntu-fw5fvp
+
+2.4.1. Adding our APT repository	=>	adding-our-apt-repository-p60cki
+
+2.4.2. Installing packages	=>	installing-packages-j9glez
 
 2.5. Installing or upgrading on Red Hat, Fedora, CentOS or ScientificLinux	=>	installing-or-upgrading-on-red-hat-fedora-centos-or-scientificlinux-1uus5a1
 

data/doc/users_guide_snippets/installation.txt

@@ -344,101 +344,108 @@ Please refer to <<verify_passenger_running,this section>>. Note that all Phusion
 
 
 [[install_on_debian_ubuntu]]
-=== Installing or upgrading on Debian 6 or Ubuntu
+=== Installing or upgrading on Debian or Ubuntu
 
-John Leach from Brightbox has kindly provided Ubuntu packages for Phusion Passenger. The Ubuntu Lucid packages are compatible with Debian 6. The packages are available from the link:http://wiki.brightbox.co.uk/docs:phusion-passenger[Brightbox repository]. Only packages for the open source version of Phusion Passenger are provided. link:https://www.phusionpassenger.com/enterprise[Phusion Passenger Enterprise] customers should use the <<rubygems_generic_install,generic RubyGems installation method>> or <<tarball_generic_install,the generic tarball installation method>> instead.
+We provide and official Phusion Passenger APT repository. This APT repository contains Phusion Passenger packages for multiple versions of Debian and Ubuntu. These packages are automatically built by our build server after we push out a source release, and thus are always up to date with the official source releases.
 
 If you use these packages to install Phusion Passenger then you do not need to run `passenger-install-apache2-module` or `passenger-install-nginx-module`. These packages contain all the binaries that you need.
 
-.Apache
+Packages are available for the x86 and x86_64 architectures. Our policy is to support all Ubuntu LTS releases that are still supported by Canonical, plus the latest non-LTS Ubuntu release, plus all Debian releases that are still supported by Debian.
 
-First register the Brightbox Apache PPA. Run this on Ubuntu:
+==== Adding our APT repository
 
------------------------------
-sudo apt-add-repository ppa:brightbox/passenger-experimental
-sudo apt-get update
------------------------------
+Packages are signed by "Phusion Automated Software Signing (auto-software-signing@phusion.nl)", fingerprint 1637 8A33 A6EF 1676 2922 526E 561F 9B9C AC40 B2F7. Install our PGP key:
 
-On Debian, the `apt-add-repository` command isn't available so you have to install the repository and the key by hand:
+--------------------------------------------------------------
+gpg --keyserver keyserver.ubuntu.com --recv-keys 561F9B9CAC40B2F7
+gpg --armor --export 561F9B9CAC40B2F7 | sudo apt-key add -
+--------------------------------------------------------------
 
------------------------------
-echo deb http://ppa.launchpad.net/brightbox/passenger-experimental/ubuntu lucid main | sudo tee /etc/apt/sources.list.d/brightbox-passenger.list
-sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C3173AA6
-sudo apt-get update
------------------------------
+Our APT repository is stored on an HTTPS server so you may need to add HTTPS support for APT:
 
-Once the PPA is added, you can proceed with installing Phusion Passenger for Apache by running:
+--------------------------------------------------------------
+sudo apt-get install apt-transport-https
+--------------------------------------------------------------
 
----------------------------------------------
-sudo apt-get install libapache2-mod-passenger
----------------------------------------------
+Next, create a file `/etc/apt/sources.list.d/passenger.list` and insert one of the following lines, depending on your distribution.
 
-The Apache package provides configuration snippets for you, so you don't need to modify any Apache configuration to get it to load Phusion Passenger.
+Phusion Passenger open source:
 
-.Nginx
+--------------------------------------------------------------
+deb https://oss-binaries.phusionpassenger.com/apt/passenger lucid main
+deb https://oss-binaries.phusionpassenger.com/apt/passenger precise main
+deb https://oss-binaries.phusionpassenger.com/apt/passenger raring main
+deb https://oss-binaries.phusionpassenger.com/apt/passenger squeeze main
+deb https://oss-binaries.phusionpassenger.com/apt/passenger wheezy main
+--------------------------------------------------------------
 
-First register the Brightbox Apache PPA. Run this on Ubuntu:
+Phusion Passenger Enterprise:
 
------------------------------
-sudo apt-add-repository ppa:brightbox/passenger-experimental
-sudo apt-get update
------------------------------
+--------------------------------------------------------------
+deb https://YOUR_ORDER_REFERENCE:YOUR_PASSWORD@www.phusionpassenger.com/enterprise_apt lucid main
+deb https://YOUR_ORDER_REFERENCE:YOUR_PASSWORD@www.phusionpassenger.com/enterprise_apt precise main
+deb https://YOUR_ORDER_REFERENCE:YOUR_PASSWORD@www.phusionpassenger.com/enterprise_apt raring main
+deb https://YOUR_ORDER_REFERENCE:YOUR_PASSWORD@www.phusionpassenger.com/enterprise_apt squeeze main
+deb https://YOUR_ORDER_REFERENCE:YOUR_PASSWORD@www.phusionpassenger.com/enterprise_apt wheezy main
+--------------------------------------------------------------
 
-On Debian, the `apt-add-repository` command isn't available so you have to install the repository and the key by hand:
+Please replace 'YOUR_ORDER_REFERENCE' and 'YOUR_PASSWORD' with your link:https://www.phusionpassenger.com/orders[Customer Area] login credentials.
 
------------------------------
-echo deb http://ppa.launchpad.net/brightbox/passenger-experimental/ubuntu lucid main | sudo tee /etc/apt/sources.list.d/brightbox-passenger-nginx.list
-sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C3173AA6
+After creating `/etc/apt/sources.list.d/passenger.list`, run:
+
+--------------------------------------------------------------
+sudo chown root: /etc/apt/sources.list.d/passenger.list
+sudo chmod 600 /etc/apt/sources.list.d/passenger.list
 sudo apt-get update
------------------------------
+--------------------------------------------------------------
 
-Once the PPA is added, you can proceed with installing Phusion Passenger for Nginx by running:
+==== Installing packages
 
----------------------------------------------
-sudo apt-get install nginx-full
----------------------------------------------
+.Open source
 
-You'll then need to enable the Phusion Passenger module in Nginx by creating the following configuration file:
+To install Phusion Passenger for Nginx:
 
------------------------------------------------
-echo "passenger_root /usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini;" | sudo tee /etc/nginx/conf.d/passenger.conf
------------------------------------------------
+--------------------------------------------------------------
+sudo apt-get install nginx-full passenger
+--------------------------------------------------------------
 
-Then restart Nginx to apply the changes:
+Then edit `/etc/nginx/nginx.conf`, and uncomment `passenger_root` and `passenger_ruby`. Finally, run `sudo service nginx restart`.
 
-----------------------------------------
-sudo /etc/init.d/nginx restart
-----------------------------------------
+To install Phusion Passenger for Apache:
 
-.Standalone
+--------------------------------------------------------------
+sudo apt-get install libapache2-mod-passenger
+--------------------------------------------------------------
 
-First register the Brightbox Apache PPA. Run this on Ubuntu:
+To install Phusion Passenger Standalone:
 
------------------------------
-sudo apt-add-repository ppa:brightbox/passenger-experimental
-sudo apt-get update
------------------------------
+--------------------------------------------------------------
+sudo apt-get install passenger
+--------------------------------------------------------------
 
-On Debian, the `apt-add-repository` command isn't available so you have to install the repository and the key by hand:
+.Enterprise
 
------------------------------
-echo deb http://ppa.launchpad.net/brightbox/passenger-experimental/ubuntu lucid main | sudo tee /etc/apt/sources.list.d/brightbox-passenger.list
-sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C3173AA6
-sudo apt-get update
------------------------------
+Before installing packages, download your license key from the link:https://www.phusionpassenger.com/orders[Customer Area] and save it as `/etc/passenger-enterprise-license`.
 
-Once the PPA is added, you can proceed with installing Phusion Passenger for Apache by running:
+To install Phusion Passenger for Nginx:
 
----------------------------------------------
-sudo apt-get install ruby-passenger
----------------------------------------------
+--------------------------------------------------------------
+sudo apt-get install nginx-full passenger-enterprise
+--------------------------------------------------------------
 
-You can then proceed with starting Phusion Passenger Standalone:
+Then edit `/etc/nginx/nginx.conf`, and uncomment `passenger_root` and `passenger_ruby`. Finally, run `sudo service nginx restart`.
 
----------------------------------------------
-cd /path-to-your-app
-passenger start
----------------------------------------------
+To install Phusion Passenger for Apache:
+
+--------------------------------------------------------------
+sudo apt-get install libapache2-mod-passenger-enterprise
+--------------------------------------------------------------
+
+To install Phusion Passenger Standalone:
+
+--------------------------------------------------------------
+sudo apt-get install passenger-enterprise
+--------------------------------------------------------------
 
 
 === Installing or upgrading on Red Hat, Fedora, CentOS or ScientificLinux
@@ -806,7 +813,7 @@ uninstalling the Phusion Passenger files, so that the web server behaves as if P
 Passenger was never installed in the first place. This might be useful to you if -
 for example - you seem to be experiencing a problem caused by Phusion Passenger,
 but you want to make sure whether that's actually the case without having
-to through the hassle of uninstalling Phusion Passenger completely. When disabled,
+to go through the hassle of uninstalling Phusion Passenger completely. When disabled,
 Phusion Passenger will not occupy any memory or CPU or otherwise interfere with
 the web server.