passenger 5.0.7 → 5.0.8

data/lib/phusion_passenger/platform_info/apache_detector.rb

@@ -196,11 +196,23 @@ module PhusionPassenger
         end
 
         if @results.empty?
+          PhusionPassenger.require_passenger_lib 'platform_info/depcheck'
+          PlatformInfo::Depcheck.load("depcheck_specs/apache2")
+          apache2 = PlatformInfo::Depcheck.find("apache2")
+          apache2_install_instructions = apache2.install_instructions.split("\n").join("\n   ")
+          # apxs2 is part of the development headers.
+          apache2_dev = PlatformInfo::Depcheck.find("apache2-dev")
+          apache2_dev_install_instructions = apache2_dev.install_instructions.split("\n").join("\n   ")
+
           log "<red>Sorry, this program cannot find an Apache installation.</red>"
           log ""
-          log "To install Apache, please run the following. It will tell you how to install Apache."
+          log "Please install Apache and its development headers."
+          log ""
+          log " <yellow>* To install Apache:</yellow>"
+          log "   #{apache2_install_instructions}"
           log ""
-          log "   <b>#{PhusionPassenger.bin_dir}/passenger-install-apache2-module</b>"
+          log " <yellow>* To install Apache development headers:</yellow>"
+          log "   #{apache2_dev_install_instructions}"
           log ""
           log "If you are sure that you have Apache installed, please read the documentation:"
           log "<b>#{APACHE2_DOC_URL}#forcing_location_of_command_line_tools_and_dependencies</b>"
@@ -213,7 +225,7 @@ module PhusionPassenger
 
       def result_for(apxs2)
         # All the results use realpaths, so the input must too.
-        apxs2 = Pathname.new(apxs2).realpath
+        apxs2 = try_realpath(apxs2)
         return @results.find { |r| r.apxs2 == apxs2 }
       end
 
@@ -234,7 +246,7 @@ module PhusionPassenger
       def remove_symlink_duplications(filenames)
         old_size = filenames.size
         filenames = filenames.map do |filename|
-          Pathname.new(filename).realpath
+          try_realpath(filename)
         end
         filenames.uniq!
         if old_size != filenames.size
@@ -251,6 +263,18 @@ module PhusionPassenger
           @failures += 1
         end
       end
+
+      def try_realpath(path)
+        if path
+          begin
+            Pathname.new(path).realpath.to_s
+          rescue Errno::ENOENT, Errno::EACCES
+            path
+          end
+        else
+          nil
+        end
+      end
     end
 
   end

data/lib/phusion_passenger/platform_info/compiler.rb

@@ -261,6 +261,7 @@ module PhusionPassenger
     # for that too.
     def self.try_compile_with_warning_flag(description, language, source, flags = nil)
       extension = detect_language_extension(language)
+      result = nil
       create_temp_file("passenger-compile-check.#{extension}") do |filename, f|
         f.puts(source)
         f.close
@@ -268,8 +269,27 @@ module PhusionPassenger
           "-c '#{filename}' -o '#{filename}.o'",
           flags)
         result = run_compiler(description, command, filename, source, true)
-        return result && result[:result] && result[:output] !~ /unknown warning option/i
+        result = result && result[:result] && result[:output] !~ /unknown warning option/i
       end
+      return false if !result
+
+      # For some reason, GCC does not complain about a warning flag
+      # not being supported unless the source contains another error. So we
+      # check for this.
+      create_temp_file("passenger-compile-check.#{extension}") do |filename, f|
+        source = %Q{
+          void foo() {
+            return error;
+          }
+        }
+        f.puts(source)
+        f.close
+        command = create_compiler_command(language,
+          "-c '#{filename}' -o '#{filename}.o'",
+          flags)
+        result = run_compiler("#{description} (really)", command, filename, source, :always)
+      end
+      result && !result[:output].include?(flags)
     end
 
     def self.try_link(description, language, source, flags = nil)
@@ -378,34 +398,9 @@ module PhusionPassenger
     memoize :cxx_supports_no_tls_direct_seg_refs_option?, true
 
     def self.compiler_supports_wno_ambiguous_member_template?
-      result = try_compile_with_warning_flag(
+      try_compile_with_warning_flag(
         "Checking for C++ compiler '-Wno-ambiguous-member-template' support",
         :cxx, '', '-Wno-ambiguous-member-template')
-      return false if !result
-
-      # For some reason, GCC does not complain about -Wno-ambiguous-member-template
-      # not being supported unless the source contains another error. So we
-      # check for this.
-      create_temp_file("passenger-compile-check.cpp") do |filename, f|
-        source = %Q{
-          void foo() {
-            return error;
-          }
-        }
-        f.puts(source)
-        f.close
-        begin
-          command = create_compiler_command(:cxx,
-            "-c '#{filename}' -o '#{filename}.o'",
-            '-Wno-ambiguous-member-template')
-          result = run_compiler("Checking whether C++ compiler '-Wno-ambiguous-member-template' support is *really* supported",
-            command, filename, source, :always)
-        ensure
-          File.unlink("#{filename}.o") rescue nil
-        end
-      end
-
-      return result && result[:output] !~ /-Wno-ambiguous-member-template/
     end
     memoize :compiler_supports_wno_ambiguous_member_template?, true
 

data/lib/phusion_passenger/standalone/start_command.rb

@@ -46,6 +46,7 @@ module PhusionPassenger
         :engine            => "nginx",
         :nginx_version     => PREFERRED_NGINX_VERSION,
         :log_level         => DEFAULT_LOG_LEVEL,
+        :auto              => !STDIN.tty? || !STDOUT.tty?,
         :ctls              => [],
         :envvars           => {}
       }.freeze
@@ -246,6 +247,11 @@ module PhusionPassenger
             "application. Default: 1") do |value|
             options[:min_instances] = value
           end
+          opts.on("--pool-idle-time SECONDS", Integer,
+            "Maximum time that processes may be idle.#{nl}" +
+            "Default: #{DEFAULT_POOL_IDLE_TIME}") do |value|
+            options[:pool_idle_time] = value
+          end
           opts.on("--concurrency-model NAME", String,
             "The concurrency model to use, either#{nl}" +
             "'process' or 'thread' (Enterprise only).#{nl}" +
@@ -335,6 +341,10 @@ module PhusionPassenger
           opts.on("--log-level NUMBER", Integer, "Log level to use. Default: #{DEFAULT_LOG_LEVEL}") do |value|
             options[:log_level] = value
           end
+          opts.on("--auto", "Run in non-interactive mode. Default when#{nl}" +
+            "stdin or stdout is not a TTY") do
+            options[:auto] = true
+          end
           opts.on("--ctl NAME=VALUE", String) do |value|
             if value !~ /=.+/
               abort "*** ERROR: invalid --ctl format: #{value}"
@@ -479,6 +489,9 @@ module PhusionPassenger
           "--connect-timeout", "0",
           "--idle-timeout", "0"
         ]
+        if @options[:auto]
+          args << "--auto"
+        end
         if @options[:binaries_url_root]
           args << "--url-root"
           args << @options[:binaries_url_root]
@@ -732,7 +745,7 @@ module PhusionPassenger
         trap("INT", "DEFAULT")
         trap("TERM", "DEFAULT")
       end
-  
+
       def trapped_intterm(signal)
         if @traps_captured == 1
           @traps_captured += 1
@@ -741,11 +754,11 @@ module PhusionPassenger
           exit!(1)
         end
       end
-    
+
       def trapsafe_shutdown_and_cleanup(error_occurred)
         # Ignore INT and TERM once, to allow clean shutdown in e.g. Foreman
         capture_traps_intterm
-        
+
         # Stop engine
         if @engine && (error_occurred || should_wait_until_engine_has_exited?)
           @console_mutex.synchronize do

data/lib/phusion_passenger/standalone/start_command/builtin_engine.rb

@@ -134,6 +134,7 @@ module PhusionPassenger
           add_flag_param(command, :load_shell_envvars, "--load-shell-envvars")
           add_param(command, :max_pool_size, "--max-pool-size")
           add_param(command, :min_instances, "--min-instances")
+          add_param(command, :pool_idle_time, "--pool-idle-time")
           add_enterprise_param(command, :concurrency_model, "--concurrency-model")
           add_enterprise_param(command, :thread_count, "--app-thread-count")
           add_enterprise_param(command, :max_request_time, "--max-request-time")

data/resources/templates/apache2/rpm_installation_recommended.txt.erb

@@ -0,0 +1,19 @@
+<banner>Installation through RPMs recommended</banner>
+
+It looks like you are on a Red Hat or CentOS operating system, with <b>SELinux</b>
+enabled. SELinux is a security mechanism for which special <%= SHORT_PROGRAM_NAME %>-specific
+configuration is required. We supply this configuration as part of
+our <%= SHORT_PROGRAM_NAME %> <b>RPMs</b>.
+
+However, <%= SHORT_PROGRAM_NAME %> is currently installed through <%= PhusionPassenger.packaging_method_description %> and does not
+include any SELinux configuration. Therefore, we recommend that you:
+
+ 1. Uninstall your current <%= SHORT_PROGRAM_NAME %> install.
+ 2. Reinstall <%= SHORT_PROGRAM_NAME %> through the RPMs that we provide:
+    <yellow><%= APACHE2_DOC_URL %>#installing_or_upgrading_on_red_hat</yellow>
+
+What would you like to do?
+
+<b>Press Ctrl-C to exit this installer so that you can install RPMs (recommended)</b>
+  -OR-
+<b>Press Enter to continue using this installer anyway</b>

data/resources/templates/standalone/config.erb

@@ -41,7 +41,7 @@ events {
 http {
     log_format debug '[$time_local] $msec  "$request" $status conn=$connection sent=$bytes_sent body_sent=$body_bytes_sent';
     include '<%= PhusionPassenger.resources_dir %>/mime.types';
-    
+
     <% if @options[:ruby] %>
         passenger_ruby <%= @options[:ruby] %>;
     <% else %>
@@ -53,7 +53,7 @@ http {
     <% if @options[:python] %>
         passenger_python <%= @options[:python] %>;
     <% end %>
-    
+
     passenger_root '<%= PhusionPassenger.install_spec %>';
     passenger_abort_on_startup_error on;
     passenger_ctl cleanup_pidfiles <%= serialize_strset("#{@working_dir}/temp_dir_toucher.pid") %>;
@@ -61,6 +61,7 @@ http {
     <%= nginx_option :passenger_log_level, :log_level %>
     <%= nginx_option :passenger_max_pool_size, :max_pool_size %>
     <%= nginx_option :passenger_min_instances, :min_instances %>
+    <%= nginx_option :passenger_pool_idle_time, :pool_idle_time %>
     <% if @options[:user] %>
         passenger_user <%= @options[:user] %>;
         passenger_default_user <%= @options[:user] %>;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passenger
 version: !ruby/object:Gem::Version
-  version: 5.0.7
+  version: 5.0.8
 platform: ruby
 authors:
 - Phusion - http://www.phusion.nl/
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-28 00:00:00.000000000 Z
+date: 2015-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -87,7 +87,6 @@ files:
 - configure
 - dev/ci/inituidgid
 - dev/ci/run_jenkins.sh
-- dev/ci/run_rpm_tests.sh
 - dev/ci/run_travis.sh
 - dev/copy_boost_headers
 - dev/install_scripts_bootstrap_code.rb
@@ -2848,6 +2847,7 @@ files:
 - resources/templates/apache2/notify_apache_module_installed.txt.erb
 - resources/templates/apache2/possible_solutions_for_compilation_and_installation_problems.txt.erb
 - resources/templates/apache2/present_choice_for_no_update_config.txt.erb
+- resources/templates/apache2/rpm_installation_recommended.txt.erb
 - resources/templates/apache2/run_installer_as_root_for_apache_analysis.txt.erb
 - resources/templates/apache2/welcome.txt.erb
 - resources/templates/config/agent_compiler/confirm_enable_optimizations.txt.erb

metadata.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJVP5XYAAoJECrHRaUKISqMX2UIALXnyIQNfxL8pzYSq0RXsULD
-ee9zcpGYagIQAsRw5fgUrdp3GJ2zVAPqKNkJjG0D5eRnTLLTyPlW+xLUVJ3CKmMU
-ftF9N7cId4tGlrKBpoN4Nm3QRK27R8cUwN/P50sealilHU6M/DWGJxpNJszWwwl4
-EMjfv42MerPL1cgG0w+UPgnrw5+UFCuQzzbfmIxpCMb7JUdfhZb/lgI5PQa+PCaF
-/DAJh6UVK95DHdOlmocwmiytrB0dujMP2RBOyav/7sNLcLa2CHJ7jDsCI6/jiS5e
-hz4hvQVIgmo1KqtJ34syOg45voK1Q6hsa0MPzI7GSjwoWUkoT2drP+a3f+dug64=
-=l9PY
+iQEcBAABAgAGBQJVXENEAAoJECrHRaUKISqMhb0IAJ8sPfHIu3QKdUjqAzvIKlcF
+imKJ4SKMnC9EYcR/Tk7bSQhsvL+43WxshTYjgwO0KLa8MVs5mF/RydgOl6bo9Ofo
+V9+Pm8nRjcVGMfudHeWgIj5s9VxcHdCSIsYL7QP2j0dDtf92NOXzqvZv7KflMRyq
+Ukbe8kq7NOgiYqCHjXETfE/pviFKFplRFk2xj385mPiPE/cBAXuwr6ktiF5EPywt
+fc626wfeyg0S67ulkMrxRYJOYHX5ot/oL04W3+8NAn4gTFUPfkyeRKtWI3CyS/0t
+ROFhAi7oIfVScOc0yfGJRQqBuYeQ5U92EvX9Afwd7vRBz6CAyWFlfRi/rA+9SSg=
+=8IeM
 -----END PGP SIGNATURE-----

data/dev/ci/run_rpm_tests.sh

@@ -1,80 +0,0 @@
-#!/bin/bash
-# This script is run by run_travis.sh, to execute RPM packaging tests in the CI environment.
-
-set -e
-
-function run()
-{
-	echo "$ $@"
-	"$@"
-}
-
-function retry_run()
-{
-	local reset='\x1B[0m'
-	local red='\x1B[31m'
-	local yellow='\x1B[33m'
-
-	local max_tries="$1"
-	local number=2
-	shift
-
-	echo "$ $@"
-	while true; do
-		if "$@"; then
-			return 0
-		elif [[ $number -le $max_tries ]]; then
-			echo -e "${yellow}The command \"$@\" failed. Retrying, $number of $max_tries:${reset}"
-			(( number++ ))
-		else
-			echo -e "${red}The command \"$@\" failed after $max_tries attempts. Giving up.${reset}"
-			return 1
-		fi
-	done
-}
-
-function yum_install()
-{
-	run yum install -y --skip-broken --enablerepo centosplus "$@"
-}
-
-
-export CACHING=false
-export DEVDEPS_DEFAULT=no
-
-echo '%_excludedocs 0' > /etc/rpm/macros.imgcreate
-sed -i 's/nodocs//' /etc/yum.conf
-
-cp /etc/hosts /etc/workaround-docker-2267/hosts
-cat >> /etc/workaround-docker-2267/hosts <<EOF
-127.0.0.1 passenger.test
-127.0.0.1 mycook.passenger.test
-127.0.0.1 zsfa.passenger.test
-127.0.0.1 norails.passenger.test
-127.0.0.1 1.passenger.test 2.passenger.test 3.passenger.test
-127.0.0.1 4.passenger.test 5.passenger.test 6.passenger.test
-127.0.0.1 7.passenger.test 8.passenger.test 9.passenger.test
-EOF
-
-yum_install /packages/*.x86_64.rpm /packages/*.noarch.rpm
-perl -pi -e 's:/etc/hosts:/cte/hosts:g' /lib64/libnss_files.so.2 /lib64/libc.so.6 /lib64/libresolv.so.2
-sed -i 's|/etc/hosts|/cte/hosts|g' /usr/lib/ruby/1.8/resolv.rb
-chown -R app: /var/log/nginx /var/lib/nginx
-
-yum_install gdb
-gem install crash-watch --no-rdoc --no-ri
-
-
-cd /passenger
-retry_run 3 /system/internal/setuser app \
-	rake test:install_deps BASE_DEPS=yes SUDO=1
-retry_run 3 /system/internal/setuser app \
-	scl enable nodejs010 'rake test:install_deps NODE_MODULES=yes'
-run /system/internal/setuser app \
-	rake test:integration:native_packaging
-run /system/internal/setuser app \
-	env PASSENGER_LOCATION_CONFIGURATION_FILE=/usr/lib/ruby/site_ruby/1.8/phusion_passenger/locations.ini \
-	scl enable python27 nodejs010 'rake test:integration:apache2'
-run /system/internal/setuser app \
-	env PASSENGER_LOCATION_CONFIGURATION_FILE=/usr/lib/ruby/site_ruby/1.8/phusion_passenger/locations.ini \
-	scl enable python27 nodejs010 'rake test:integration:nginx'