passenger 5.0.6 → 5.0.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTMzY2I0N2RkY2E0MjZlYzk2NjViZWIyMzA1ZmQ0OTM1MTU1ZGRhMg==
+    ZGVkMzYyMTlmMjgxNzMzZjM2OGUwZjcyZTA2NzNiYjMxODc0NzBiMg==
   data.tar.gz: !binary |-
-    YjBkMzFiNmJkMjQ4NzJhM2EzZjMyZjM1YWYwOTVmYjA0ODkyZTI5YQ==
+    OTBhOGFhYWM3MDY4YzU5Y2M2YmQ1MWQ0MWQ4YjQyNDVkNzc5ZDk5Nw==
 SHA512:
   metadata.gz: !binary |-
-    ZTI4MGU1MjdhMzFmNDI5YzYwODc3ODI5Mjc5OTBiMGI5OTQ0N2FkOTExMTc2
-    MDI1ZDZiMzNkNDc3Yzk3OTM3ZDE2OThjOTQ4OTE1OWRlM2UwYzUxMjE3MDlk
-    ZjRkYzcwOTE3N2ZjZWNmZTk5NGNjYzQ4MTI3NjA5N2I0MmUyNjY=
+    NzU3MDE1MGEzYzExOTg2NmZlNDYxYzQ4YmQ0YzUwYWJhMjdlY2NiNWYxYTE1
+    Nzc1ZDcxZWMxNWI1ZTY1Mzc5NDYxNWZlZWMwOGVlMjJjZGI4NTJjMGQxNzZk
+    YjZiZTQ3OWI1ODZiNTMzMjU5MjEwZDY4ZmI2OWJkNDM1NDFkMTk=
   data.tar.gz: !binary |-
-    YTQwODBlYjJiMzM1ZGZiYzRlNGIwZDcyNTBlYmRmMzg5NDNiN2JiM2U0NGE0
-    ZmQ5ODlmMzQyYThjNjczZjRmNzkxMDA2ZTZjM2Q2ZmVmNzZmNjZiOWYwNjNk
-    M2FjMDA1Zjk4YmM1ZTU1N2VkM2I2ODIyNTBlYjI0Zjk0ODI4ZmE=
+    ZThmNTdiODU2MDIwODgwNmJjM2FkYzNhMjhlNDNhNjAzNDk4MGQ1ZGJkYWZk
+    OGEyMzM5MWNkNDcxMWNmNmEyNGFjOWNjYzAyMjNmNjRkNjViZTA4ODJjMTUw
+    NjNmZjQzNmRjNTM3ODhmZTIyYWU1NGY0MzA4YzBlNzIzNzllYTY=

checksums.yaml.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJVGmsTAAoJECrHRaUKISqMWU4IAJ1i9nlQrPUlu6bOF8uOfMe1
-0GNRr2q37ZeB5lzeqUxFb/qD3IoUast1H7tGaO6/7uFkgDIBLM9eCDfXtaT2oR52
-+zSYQQ6uICIuzw5hGLKQyA+za20NRspYhgOal1Seh9Urn4uRXDiuwwcAaaH2BuCg
-NorUslin3YoWxmDO/fEHPmoNe5YqgzxZvWGZBDebfhuHMi7YYKlaPESqLvGWNfSR
-rr6ygaqpWNU5FFbibVy6+fNkbBIH8tYow7RURBaQ1VPnwu51Fb+AiLumQsi1RJ5i
-6tHTNyqrRd9+DOQZctYGIt+RPGWN1XfQ2o8Ydp22qyVed45yhz8bYGrDxV/JevE=
-=my8R
+iQEcBAABAgAGBQJVP5XZAAoJECrHRaUKISqMKj8IAIGrbTDuXh7udR1pCe9K5JHf
+wsBtEQvDAZpp+mPdwddODK5a/2e0UsXoHPniq9kZIESGv/plrlW5QdO8ISjPClHB
+H/VxlnaHFgqqCoIZUxNwtO6wMHaKRM80BJZj74UcZ5GtWhKi3fymgoJDXjKpltsv
+6Og68fJdLKEDY9fYr9/V/32B7wk06cW6VTcZmZKYqUsKcroqcKUZqFmHmUddp6rf
+WUQb/ftEn2/kzOEvO4KemikyAjVVFftSLLXMAcpKqEPcEf8maaXALMdxffUPmdYm
+ljSQULByzhttNz+Aj+3l8P/UC6iMAGgZk0v6LGvm7acaSutMMOuE6Kxpc3XcM54=
+=/84R
 -----END PGP SIGNATURE-----

data.tar.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJVGmsTAAoJECrHRaUKISqMgCMIAICYJu67lJmPueuE4lvXNTPc
-xHKXjRfCpNyzINRWBkdu2G/hz6QGUcZsZwBchcstmFanh0YESg9c3NM67SVdMO4v
-U+s3S6uPW3UbkrWp57y0zqldnoqlGJu4f9NqO30MIQtGJlaEJQq6T7ndkK+dJbqc
-lOQZZWrenr7DiRDR1XjUnHKvM1rY9Lop8X+tikIoQh804TUUqe5h71BAQUu2YzS6
-KfPRDEPU4m6jmC1Ook72dLV9HZs8iXvOQLhV8zWmAlkPg/lF8FEx5tmLzUuNkQMl
-WXVNlqujpGw/BpaI64NJrbAsDrU+JCaS1CBgYV2P8J46Ba4O/VU1buaL+SeBwaE=
-=qiL8
+iQEcBAABAgAGBQJVP5XZAAoJECrHRaUKISqMA/4IAJ2gXqVHccGedmr4esxxyFYS
+RNHZgu+S/dmaC+BhuboGroSqnB3SMgR2R9efGU54NmnrDb6VJfeaj+iSSy9hTX4g
+3TL849nKlZmwc/bY1A47aZ6CXsm5XoxFsry+j4eUD4yrkJasIAvJjlBhiOy2oVyO
+cgAt18iqpdN1SyA39akeX15Qufw6sDK+4XBlXzIR2w0pXG0aCIkvil3TYCVDxlRv
+ZEABXT+63H6wuGRk3rFut8JYGFspE1PXP6u0/KSauo+EcJvzASo8Z1Tkdu7WqZtZ
+HOpaspDAJaCosT2Is23dwoAqi6EK4NIFxWqD6mm9SnK9pChXbqJ8JqrYZjqtFtA=
+=jxZu
 -----END PGP SIGNATURE-----

data/CHANGELOG

@@ -1,3 +1,29 @@
+Release 5.0.7
+-------------
+
+ * Supports changed way of specifying settings for (non-bundled) Meteor apps. Closes GH-1403.
+ * Fixes an integer-to-string conversion bug in the code responsible for buffering chunked request bodies. This bug could cause the PassengerAgent to crash due to an exception. Thanks to Marcus Rückert of SUSE for reporting this.
+ * Request-specific environment variables are no longer cached. This fixes a number of issues, such as Shibboleth not working properly and conflicts between HTTPS and non-HTTPS virtual hosts. Closes GH-1472.
+ * Fixes a memory corruption bug that would be triggered when using `passenger_base_uri`. The memory corruption bug resided in the code for resolving symlinks. Closes GH-1388.
+ * Re-introduced signal catchers during shutdown, to allow clean shutdown in Foreman. Closes GH-1454.
+ * `passenger-status --show=xml` no longer outputs the non-XML header by default. This fixes a regression as reported in a comment in GH-1136.
+ * Passenger now prefers to load Rack and Bundler from RubyGems instead of from `vendor_ruby`. This solves some issues with Rack and Bundler on Debian systems. Closes GH-1480 and GH-1478.
+ * The turbocache no longer caches responses that contain the `X-Sendfile` or the `X-Accel-Redirect` header.
+ * The preferred Nginx version has been upgraded to 1.6.3.
+ * The logging agent no longer aborts with an error if one of the Passenger root directory's parent directories is not world-executable. Closes GH-1487.
+ * [Standalone] It is now possible to configure the Ruby, Node.js and Python executable to use in Passenger Standalone through the command line options --ruby, --nodejs and --python. Closes GH-1442.
+ * [Standalone] Running `passenger start --engine=builtin --daemonize` would fail with a timeout error. This has been fixed.
+ * [Standalone] Running `passenger start --nginx-version=XXX` would crash. This has been fixed. Closes GH-1490.
+ * [Apache] Fixed some issues with X-Sendfile. Closes GH-1376.
+ * [Apache] If the installer fails to autodetect Apache while the installer is running as a normal user, it will now ask you to give it root privileges. Closes GH-1289.
+ * [Apache] The installer now validates your Apache configuration file to check for common problems. The validator can also be accessed separately by running `passenger-config validate-install --validate-apache2`.
+ * [Nginx] Introduces the `passenger_read_timeout` option for rare cases when server needs more than the default 10 minute timeout. Contributed by pkmiec. Closes [GH-PR-34](https://github.com/phusion/passenger/pull/34).
+ * [Nginx] The Nginx module now looks for index.html if the path ends in / so that it works intuitively, without needing to use try_files.
+ * Fixes wrong memory address display in crash dumps. Thanks to thoughtpolice for pointing it out.
+ * Fixes an ugly backtrace that would be shown if an invalid request is made to an application process using the private HTTP interface. Contributed by jbergler. Closes GH-1311.
+ * Various documentation improvements. Closes [GH-PR-1332](https://github.com/phusion/passenger/pull/1332), [GH-PR-1354](https://github.com/phusion/passenger/pull/1354), [GH-PR-1216](https://github.com/phusion/passenger/pull/1216), [GH-PR-1385](https://github.com/phusion/passenger/pull/1385), [GH-PR-1302](https://github.com/phusion/passenger/pull/1302).
+
+
 Release 5.0.6
 -------------
 

data/Rakefile

@@ -53,7 +53,6 @@ else
   require 'build/node_tests'
   require 'build/integration_tests'
   require 'build/misc'
-  require 'build/debian'
 end
 
 #### Default tasks

data/bin/passenger-install-apache2-module

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # encoding: binary
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2014 Phusion
+#  Copyright (c) 2010-2015 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -48,6 +48,7 @@ PhusionPassenger.require_passenger_lib 'platform_info/ruby'
 PhusionPassenger.require_passenger_lib 'platform_info/apache'
 PhusionPassenger.require_passenger_lib 'platform_info/apache_detector'
 PhusionPassenger.require_passenger_lib 'abstract_installer'
+PhusionPassenger.require_passenger_lib 'config/validate_install_command'
 PhusionPassenger.require_passenger_lib 'utils/terminal_choice_menu'
 
 class Installer < PhusionPassenger::AbstractInstaller
@@ -133,6 +134,7 @@ class Installer < PhusionPassenger::AbstractInstaller
     check_write_permission_to_web_server_config_files || exit(1)
     if compile_apache2_module
       install_apache2_config_snippets || exit(1)
+      validate_install
       show_deployment_example
     else
       show_possible_solutions_for_compilation_and_installation_problems
@@ -188,7 +190,7 @@ private
 
   def check_whether_there_are_multiple_apache_installs
     new_screen
-    puts '<banner>Sanity checking Apache installation...</banner>'
+    puts '<banner>Checking whether there are multiple Apache installations...</banner>'
 
     output = StringIO.new
     detector = PlatformInfo::ApacheDetector.new(output)
@@ -197,14 +199,25 @@ private
       detector.report
       @apache2 = detector.result_for(PlatformInfo.apxs2)
       if @apache2.nil?
-        render_template 'apache2/apache_install_broken',
-          :apxs2 => PlatformInfo.apxs2,
-          :sudo_s_e => PhusionPassenger::PlatformInfo.ruby_sudo_shell_command("-E"),
-          :ruby => PhusionPassenger::PlatformInfo.ruby_command,
-          :passenger_config => "#{PhusionPassenger.bin_dir}/passenger-config"
+        # Print an extra newline because the autodetection routines
+        # may have run some commands which printed stuff to stderr.
+        puts
+
+        if Process.uid == 0
+          render_template 'apache2/apache_install_broken',
+            :apxs2 => PlatformInfo.apxs2,
+            :sudo_s_e => PhusionPassenger::PlatformInfo.ruby_sudo_shell_command("-E"),
+            :ruby => PhusionPassenger::PlatformInfo.ruby_command,
+            :passenger_config => "#{PhusionPassenger.bin_dir}/passenger-config"
+        else
+          render_template 'apache2/run_installer_as_root_for_apache_analysis',
+            :sudo => PhusionPassenger::PlatformInfo.ruby_sudo_command,
+            :sudo_s_e => PhusionPassenger::PlatformInfo.ruby_sudo_shell_command("-E"),
+            :ruby => PhusionPassenger::PlatformInfo.ruby_command,
+            :installer => "#{PhusionPassenger.bin_dir}/passenger-install-apache2-module #{ORIG_ARGV.join(' ')}"
+        end
         return false
-      end
-      if detector.results.size > 1
+      elsif detector.results.size > 1
         other_installs = detector.results - [@apache2]
         render_template 'apache2/multiple_apache_installations_detected',
           :current => @apache2,
@@ -225,7 +238,7 @@ private
           return true
         end
       else
-        puts '<green>All good!</green>'
+        puts '<green>Only a single installation detected. This is good.</green>'
         return true
       end
     ensure
@@ -234,13 +247,13 @@ private
   end
 
   def check_whether_apache_uses_compatible_mpm
-    # 'httpd -V' output is in the form of:
+    # 'apache2ctl -V' output is in the form of:
     #
     # Server MPM:      Prefork     # <--- this line is not always available!
     # ...
     # Server compiled with....
     #  -D APACHE_MPM_DIR="server/mpm/prefork"
-    output = PlatformInfo.httpd_V
+    output = PlatformInfo.apache2ctl_V
     output =~ /^Server MPM: +(.*)$/
     if $1
       mpm = $1.downcase
@@ -765,6 +778,27 @@ private
     wait
   end
 
+  def validate_install
+    new_screen
+    puts "<banner>Validating installation...</banner>"
+    puts
+    validator = PhusionPassenger::Config::ValidateInstallCommand.new([
+      "--auto", "--validate-apache2", "--invoked-from-installer"])
+    exit_code = validator.run_and_get_exit_code
+    STDOUT.write(@colors.default_terminal_color)
+
+    case exit_code
+    when PhusionPassenger::Config::ValidateInstallCommand::FAIL_EXIT_CODE
+      puts "<b>Please solve the above issues, then press ENTER to continue.</b>"
+      wait
+    when PhusionPassenger::Config::ValidateInstallCommand::WARN_EXIT_CODE
+      puts "<b>Press ENTER to continue.</b>"
+      wait
+    else
+      exit(exit_code)
+    end
+  end
+
   def show_deployment_example
     new_screen
     render_template 'apache2/deployment_example',

data/bin/passenger-status

@@ -45,7 +45,7 @@ include PhusionPassenger::SharedConstants
 include PhusionPassenger::AdminTools
 include PhusionPassenger::Utils::AnsiColors
 
-DEFAULT_OPTIONS = { :show => 'pool', :color => STDOUT.tty?, :header => true }.freeze
+DEFAULT_OPTIONS = { :show => 'pool', :color => STDOUT.tty? }.freeze
 
 
 ##### Show status command #####
@@ -105,7 +105,10 @@ def find_instance_by_name_prefix(name)
 end
 
 def show_status(instance, options)
-  print_header(STDOUT, instance) if options[:header]
+  # if the noshow override is not specified, the default is to show the header, unless show=xml
+  if options[:noheader] != true && options[:show] != 'xml' 
+    print_header(STDOUT, instance)
+  end
 
   case options[:show]
   when 'pool'
@@ -265,7 +268,7 @@ def create_option_parser(options)
     opts.on("--no-header", "Do not display an informative header#{nl}" <<
             "containing the timestamp, version number,#{nl}" <<
             "etc.") do
-      options[:header] = false
+      options[:noheader] = true
     end
     opts.on("--force-colors", "Display colors even if stdout is not a TTY") do
       options[:color] = true

data/build/packaging.rb

@@ -95,6 +95,14 @@ def git_tag
   return "#{git_tag_prefix}-#{VERSION_STRING}"
 end
 
+def apt_repo_name
+  if is_open_source?
+    "passenger"
+  else
+    "passenger-enterprise"
+  end
+end
+
 def homebrew_dir
   return "/tmp/homebrew"
 end
@@ -436,7 +444,7 @@ task 'package:initiate_debian_building' do
   end
 
   uri = URI.parse("https://oss-jenkins.phusion.nl/buildByToken/buildWithParameters?" +
-    "job=Passenger%20#{type}%20Debian%20packages%20(release)&ref=#{git_tag}")
+    "job=Passenger%20#{type}%20Debian%20packages%20(release)&ref=#{git_tag}&repo=#{apt_repo_name}")
   http = Net::HTTP.new(uri.host, uri.port)
   http.use_ssl = true
   http.verify_mode = OpenSSL::SSL::VERIFY_PEER

data/dev/ci/run_travis.sh

@@ -74,16 +74,6 @@ function retry_run()
 function apt_get_update() {
 	if [[ "$apt_get_updated" = "" ]]; then
 		apt_get_updated=1
-		if [[ "$TEST_DEBIAN_PACKAGING" = 1 ]]; then
-			if ! [[ -e /usr/bin/add-apt-repository ]]; then
-				run sudo apt-get update
-				run sudo apt-get install -y --no-install-recommends python-software-properties
-				if ! [[ -e /usr/bin/add-apt-repository ]]; then
-					run sudo apt-get install -y --no-install-recommends software-properties-common
-				fi
-			fi
-			run sudo add-apt-repository -y ppa:phusion.nl/misc
-		fi
 		run sudo apt-get update
 	fi
 }
@@ -218,32 +208,6 @@ if [[ "$TEST_STANDALONE" = 1 ]]; then
 	run bundle exec drake -j$COMPILE_CONCURRENCY test:integration:standalone
 fi
 
-if [[ "$TEST_DEBIAN_PACKAGING" = 1 ]]; then
-	apt_get_update
-	run sudo apt-get install -y --no-install-recommends \
-		devscripts debhelper rake apache2-mpm-worker apache2-threaded-dev \
-		libev-dev gdebi-core source-highlight
-	if [[ `lsb_release -r -s` = 12.04 ]]; then
-		sudo apt-get install -y --no-install-recommends \
-			ruby1.8 ruby1.8-dev ruby1.9.1 ruby1.9.1-dev rubygems
-	else
-		sudo apt-get install -y --no-install-recommends \
-			ruby1.9.1 ruby1.9.1-dev ruby2.0 ruby2.0-dev
-	fi
-	install_test_deps_with_doctools
-	install_node_and_modules
-	run bundle exec rake debian:dev debian:dev:reinstall
-	run bundle exec drake -j$COMPILE_CONCURRENCY test:integration:native_packaging SUDO=1 PRINT_FAILED_COMMAND_OUTPUT=1
-	(
-		export GEM_PATH="$ORIG_GEM_PATH"
-		if ! env NOEXEC_DISABLE=1 rvmsudo -E ruby -rrack -e '' 2>/dev/null; then
-			retry_run 3 gem install rack --no-rdoc --no-ri
-		fi
-	)
-	run env PASSENGER_LOCATION_CONFIGURATION_FILE=/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini \
-		bundle exec drake -j$COMPILE_CONCURRENCY test:integration:apache2 SUDO=1
-fi
-
 if [[ "$TEST_RPM_PACKAGING" = 1 ]]; then
 	if [[ "$TEST_RPM_BUILDING" != 0 ]]; then
 		pushd packaging/rpm

data/doc/ServerOptimizationGuide.html

@@ -235,7 +235,7 @@ PassengerPreStart http://your-website-url.com
 
 <h4>Step 2: determine the system's limits</h4>
 
-<p>First, let's define the maximum number of (single-threaded) processes, or the number of threads, that you can comfortably have given the amount of RAM you have. This is a reasonable upper limit that you can reach without degrading system performance. This number is not the final optimal number, but is merely used for further caculations in later steps.</p>
+<p>First, let's define the maximum number of (single-threaded) processes, or the total number of threads, that you can comfortably have given the amount of RAM you have. This is a reasonable upper limit that you can reach without degrading system performance. This number is not the final optimal number, but is merely used for further caculations in later steps.</p>
 
 <p>There are two formulas that we can use, depending on what kind of concurrency model your application is using in production.</p>
 
@@ -262,7 +262,8 @@ PassengerPreStart http://your-website-url.com
 
 <pre><code>max_app_threads_per_process =
   ((TOTAL_RAM * 0.75) - (CHOSEN_NUMBER_OF_PROCESSES * RAM_PER_PROCESS * 0.9)) /
-  (RAM_PER_PROCESS / 10)
+  (RAM_PER_PROCESS / 10) /
+  CHOSEN_NUMBER_OF_PROCESSES
 </code></pre>
 
 <p>Here, <code>CHOSEN_NUMBER_OF_PROCESSES</code> is the number of application processes you want to use. In case of Ruby, Python, Node.js and Meteor, this should be equal to <code>NUMBER_OF_CPUS</code>. This is because all these languages can only utilize a single CPU core per process. If you're using a language runtime that does not have a Global Interpreter Lock, e.g. JRuby or Rubinius, then <code>CHOSEN_NUMBER_OF_PROCESSES</code> can be 1.</p>
@@ -271,8 +272,8 @@ PassengerPreStart http://your-website-url.com
 
 <ul>
 <li><code>(TOTAL_RAM * 0.75)</code>: The same as explained earlier.</li>
-<li><code>(CHOSEN_NUMBER_OF_PROCESSES * RAM_PER_PROCESS)</code>: In multithreaded scenarios, the application processes consume a constant amount of memory, so we deduct this from the RAM that is available to applications. The result is the amount of RAM available to application threads.</li>
-<li><code>/ (RAM_PER_PROCESS / 10)</code>: A thread consumes about 10% of the amount of memory a process would, so we divide the amount of RAM available to threads with this number. What we get is the number of threads that the system can handle.</li>
+<li><code>(CHOSEN_NUMBER_OF_PROCESSES * RAM_PER_PROCESS * 0.9)</code>: This calculates the amount of memory that all the processes together would consume, assuming they're not running any threads. When this is deducted from <code>TOTAL_RAM * 0.75</code>, we end up with the amount of RAM available to application threads.</li>
+<li><code>/ (RAM_PER_PROCESS / 10)</code>: We estimate that a thread consumes ~10% of the amount of memory a process would, so we divide the amount of RAM available to threads with this number. What we get is the number of threads that the system can handle.</li>
 </ul>
 
 
@@ -462,26 +463,26 @@ PassengerMinInstances 163
 
 <pre><code># Use this formula for multithreaded deployments.
 max_app_threads_per_process
-= ((1024 * 32 * 0.75) - (8 * 150)) / (150 / 10)
-= 1558.4
+= ((1024 * 32 * 0.75) - (8 * 150)) / (150 / 10) / 8
+= 194.8
 </code></pre>
 
-<p>Conclusion: you should use 1558 threads per process.</p>
+<p>Conclusion: you should use 195 threads per process.</p>
 
 <pre><code># Standalone
-passenger start --max-pool-size=8 --min-instances=8 --concurrency-model=thread --thread-count=1558
+passenger start --max-pool-size=8 --min-instances=8 --concurrency-model=thread --thread-count=195
 
 # Nginx
 passenger_max_pool_size 8;
 passenger_min_instances 8;
 passenger_concurrency_model thread;
-passenger_thread_count 1558;
+passenger_thread_count 195;
 
 # Apache
 PassengerMaxPoolSize 8
-PassengerMinInstances *
+PassengerMinInstances 8
 PassengerConcurrencyModel thread
-PassengerThreadCount 1558
+PassengerThreadCount 195
 </code></pre>
 
 <p>Because of the huge number of threads, this only works on a 64-bit platform. If you're on a 32-bit platform, consider lowering the number of threads while raising the number of processes. For example, you can double the number of processes (to 16) and halve the number of threads (to 779).</p>

data/doc/ServerOptimizationGuide.txt.md

@@ -87,7 +87,7 @@ In our experience, a typical medium-sized single-threaded Rails application proc
 
 #### Step 2: determine the system's limits
 
-First, let's define the maximum number of (single-threaded) processes, or the number of threads, that you can comfortably have given the amount of RAM you have. This is a reasonable upper limit that you can reach without degrading system performance. This number is not the final optimal number, but is merely used for further caculations in later steps.
+First, let's define the maximum number of (single-threaded) processes, or the total number of threads, that you can comfortably have given the amount of RAM you have. This is a reasonable upper limit that you can reach without degrading system performance. This number is not the final optimal number, but is merely used for further caculations in later steps.
 
 There are two formulas that we can use, depending on what kind of concurrency model your application is using in production.
 
@@ -110,15 +110,16 @@ The formula for multithreaded concurrency is as follows:
 
     max_app_threads_per_process =
       ((TOTAL_RAM * 0.75) - (CHOSEN_NUMBER_OF_PROCESSES * RAM_PER_PROCESS * 0.9)) /
-      (RAM_PER_PROCESS / 10)
+      (RAM_PER_PROCESS / 10) /
+      CHOSEN_NUMBER_OF_PROCESSES
 
 Here, `CHOSEN_NUMBER_OF_PROCESSES` is the number of application processes you want to use. In case of Ruby, Python, Node.js and Meteor, this should be equal to `NUMBER_OF_CPUS`. This is because all these languages can only utilize a single CPU core per process. If you're using a language runtime that does not have a Global Interpreter Lock, e.g. JRuby or Rubinius, then `CHOSEN_NUMBER_OF_PROCESSES` can be 1.
 
 The formula is derived as follows:
 
  * `(TOTAL_RAM * 0.75)`: The same as explained earlier.
- * `(CHOSEN_NUMBER_OF_PROCESSES * RAM_PER_PROCESS)`: In multithreaded scenarios, the application processes consume a constant amount of memory, so we deduct this from the RAM that is available to applications. The result is the amount of RAM available to application threads.
- * `/ (RAM_PER_PROCESS / 10)`: A thread consumes about 10% of the amount of memory a process would, so we divide the amount of RAM available to threads with this number. What we get is the number of threads that the system can handle.
+ * `(CHOSEN_NUMBER_OF_PROCESSES * RAM_PER_PROCESS * 0.9)`: This calculates the amount of memory that all the processes together would consume, assuming they're not running any threads. When this is deducted from `TOTAL_RAM * 0.75`, we end up with the amount of RAM available to application threads.
+ * `/ (RAM_PER_PROCESS / 10)`: We estimate that a thread consumes ~10% of the amount of memory a process would, so we divide the amount of RAM available to threads with this number. What we get is the number of threads that the system can handle.
 
 On 32-bit systems, `max_app_threads_per_process` should not be higher than about 200. Assuming an 8 MB stack size per thread, you will run out of virtual address space if you go much further. On 64-bit systems you don’t have to worry about this problem.
 
@@ -263,25 +264,25 @@ But this time you're using multithreading with 8 application processes (because
 
     # Use this formula for multithreaded deployments.
     max_app_threads_per_process
-    = ((1024 * 32 * 0.75) - (8 * 150)) / (150 / 10)
-    = 1558.4
+    = ((1024 * 32 * 0.75) - (8 * 150)) / (150 / 10) / 8
+    = 194.8
 
-Conclusion: you should use 1558 threads per process.
+Conclusion: you should use 195 threads per process.
 
     # Standalone
-    passenger start --max-pool-size=8 --min-instances=8 --concurrency-model=thread --thread-count=1558
+    passenger start --max-pool-size=8 --min-instances=8 --concurrency-model=thread --thread-count=195
 
     # Nginx
     passenger_max_pool_size 8;
     passenger_min_instances 8;
     passenger_concurrency_model thread;
-    passenger_thread_count 1558;
+    passenger_thread_count 195;
 
     # Apache
     PassengerMaxPoolSize 8
-    PassengerMinInstances *
+    PassengerMinInstances 8
     PassengerConcurrencyModel thread
-    PassengerThreadCount 1558
+    PassengerThreadCount 195
 
 Because of the huge number of threads, this only works on a 64-bit platform. If you're on a 32-bit platform, consider lowering the number of threads while raising the number of processes. For example, you can double the number of processes (to 16) and halve the number of threads (to 779).