passenger 5.0.0.rc2 → 5.0.1

data/lib/phusion_passenger/utils/terminal_choice_menu.rb

@@ -50,8 +50,9 @@ module PhusionPassenger
         end
       end
 
-      def initialize(choices)
+      def initialize(choices, mode = :multiple_choice)
         @choices = choices.map { |choice| Choice.create(choice) }
+        @mode    = mode
         @pointer = 0
         @index   = index_choices
       end
@@ -71,6 +72,11 @@ module PhusionPassenger
               done = process_input
               clear_screen if !done
             end
+            if @mode == :single_choice
+              [@pointer, @choices[@pointer].name]
+            else
+              nil
+            end
           ensure
             restore_mode
             show_cursor
@@ -79,6 +85,7 @@ module PhusionPassenger
         else
           display_choices
           puts
+          nil
         end
       end
 
@@ -105,17 +112,19 @@ module PhusionPassenger
         case getchar(STDIN)
         when "\x1b"
           process_cursor_move
-          return false
+          false
         when " "
-          process_toggle
-          return false
+          if @mode == :multiple_choice
+            process_toggle
+          end
+          false
         when "!"
           process_disable_utf8
-          return false
+          false
         when "\r"
-          return true
+          true
         else
-          return false
+          false
         end
       end
 
@@ -146,15 +155,23 @@ module PhusionPassenger
           str << " #{pointer} #{checkbox}  #{choice.name}\r\n"
         end
         str.chomp!
-        return str
+        str
       end
 
       def render_pointer(index)
-        return @pointer == index ? maybe_utf8("‣", ">") : " "
+        @pointer == index ? maybe_utf8("‣", ">") : " "
       end
 
       def render_checkbox(checked)
-        return checked ? maybe_utf8("⬢", "(*)") : maybe_utf8("⬡", "( )")
+        if @mode == :multiple_choice
+          if checked
+            maybe_utf8("⬢", "(*)")
+          else
+            maybe_utf8("⬡", "( )")
+          end
+        else
+          nil
+        end
       end
 
       def display(str)

data/resources/templates/standalone/config.erb

@@ -139,9 +139,9 @@ http {
         <% if app[:thread_count] && app[:thread_count] != DEFAULT_APP_THREAD_COUNT %>passenger_thread_count <%= app[:thread_count] %>;<% end %>
         <% if app[:min_instances] %>passenger_min_instances <%= app[:min_instances] %>;<% end %>
         <% if app[:restart_dir] %>passenger_restart_dir '<%= app[:restart_dir] %>';<% end %>
-        <% if @options[:sticky_sessions] %>passenger_sticky_sessions on;<% end %>
-        <% if @options[:sticky_sessions_cookie_name] %>passenger_sticky_sessions_cookie_name '<%= @options[:sticky_sessions_cookie_name] %>';<% end %>
-        <% if @options[:vary_turbocache_by_cookie] %>passenger_vary_turbocache_by_cookie '<%= @options[:vary_turbocache_by_cookie] %>';<% end %>
+        <% if app[:sticky_sessions] %>passenger_sticky_sessions on;<% end %>
+        <% if app[:sticky_sessions_cookie_name] %>passenger_sticky_sessions_cookie_name '<%= app[:sticky_sessions_cookie_name] %>';<% end %>
+        <% if app[:vary_turbocache_by_cookie] %>passenger_vary_turbocache_by_cookie '<%= app[:vary_turbocache_by_cookie] %>';<% end %>
         <% if app[:union_station_key] %>
             union_station_support on;
             union_station_key <%= app[:union_station_key] %>;
@@ -151,7 +151,7 @@ http {
             ssl_certificate_key <%= app[:ssl_certificate_key] %>;
         <% end %>
 
-        <% @options[:envvars].each_pair do |name, value| %>
+        <% app[:envvars].each_pair do |name, value| %>
             passenger_env_var '<%= name %>' '<%= value %>';
         <% end %>
 

data/test/cxx/CxxTestMain.cpp

@@ -11,6 +11,7 @@
 #include <cstring>
 #include <unistd.h>
 
+#include <agents/Base.h>
 #include <Utils.h>
 #include <Utils/IOUtils.h>
 #include <Utils/StrIntUtils.h>
@@ -131,29 +132,14 @@ loadConfigFile() {
 	}
 }
 
-static void
-abortHandler(int signo, siginfo_t *info, void *ctx) {
-	// Stop itself so that we can attach it to gdb.
-	static const char message[] = "Crash handler called!\n";
-	write(STDERR_FILENO, message, sizeof(message) - 1);
-	raise(SIGSTOP);
-	// Run default signal handler.
-	raise(signo);
-}
-
 static void
 installAbortHandler() {
-	const char *stopOnAbort = getenv("STOP_ON_ABORT");
-	if (stopOnAbort != NULL && *stopOnAbort != '\0' && *stopOnAbort != '0') {
-		struct sigaction action;
-		action.sa_sigaction = abortHandler;
-		action.sa_flags = SA_RESETHAND | SA_SIGINFO;
-		sigemptyset(&action.sa_mask);
-		sigaction(SIGABRT, &action, NULL);
-		sigaction(SIGSEGV, &action, NULL);
-		sigaction(SIGBUS, &action, NULL);
-		sigaction(SIGFPE, &action, NULL);
-	}
+	VariantMap options;
+
+	options.set("passenger_root", resourceLocator->getRoot());
+
+	initializeAgentOptions(options);
+	installAgentAbortHandler();
 }
 
 int
@@ -176,7 +162,9 @@ main(int argc, char *argv[]) {
 	resourceLocator = new ResourceLocator(extractDirName(path));
 
 	loadConfigFile();
-	installAbortHandler();
+	if (hasEnvOption("PASSENGER_ABORT_HANDLER", true) && !hasEnvOption("GDB", false)) {
+		installAbortHandler();
+	}
 
 	bool all_ok = true;
 	if (runMode == RUN_ALL_GROUPS) {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passenger
 version: !ruby/object:Gem::Version
-  version: 5.0.0.rc2
+  version: 5.0.1
 platform: ruby
 authors:
 - Phusion - http://www.phusion.nl/
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-20 00:00:00.000000000 Z
+date: 2015-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -2481,6 +2481,12 @@ files:
 - ext/common/ApplicationPool2/Options.h
 - ext/common/ApplicationPool2/PipeWatcher.h
 - ext/common/ApplicationPool2/Pool.h
+- ext/common/ApplicationPool2/Pool/AnalyticsCollection.h
+- ext/common/ApplicationPool2/Pool/Debug.h
+- ext/common/ApplicationPool2/Pool/GarbageCollection.h
+- ext/common/ApplicationPool2/Pool/GeneralUtils.h
+- ext/common/ApplicationPool2/Pool/Inspection.h
+- ext/common/ApplicationPool2/Pool/ProcessUtils.h
 - ext/common/ApplicationPool2/Process.h
 - ext/common/ApplicationPool2/Session.h
 - ext/common/ApplicationPool2/SmartSpawner.h
@@ -3342,9 +3348,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: passenger
 rubygems_version: 2.2.2

metadata.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJU5zPQAAoJECrHRaUKISqMdhUH/2gCqNzD6k9SF95PpPkvpHYd
-eat4jQTLH7kLa/RznZrRSTUE4O6Yr9uvCIAsG5oFFEUEDEuz4cn4V5asWXpjON9b
-QE3w8+TU2MsVS6C34EDU/Krinf/+3faQxD/JxVaPlSDiLo3PkHIt6IZBQQLGFSYI
-FqCx/ipKfnhQJUtWLQwwdQS35qSFYZ/OcY0fgLiM2/YOXW+m/mNTDoxhOPqTV3iD
-aTJj+JMBYuvFfkrNfPRYxt4ZilTKFzwGeAFQOCL8tE/2iMbJ3i4WCW+QeX94qqQN
-G2iuj+IT1HKnfkdlq1mnhO1JcYjREkxJXlHg17GKhC5cyAPmQ5UQDKBXVlcap+w=
-=xp1q
+iQEcBAABAgAGBQJU9xtMAAoJECrHRaUKISqMQGAH/0qQ1K8rl5AIKAbcO/sL2R6/
+N9pZZpUvXy6kpugyvZaACWdTfF+1wvokcqyxdHr/lwu3BfJ+ivN1x9hhiGFiLPE1
+T3Qy32h6wttbw2tWc+peK/NnkAvfIzG+GPKYGAu1HAGVjCCu4gj2RkzLH1WvZQtD
+Zt1asLcNg2TviAWYZ1mVRSRgJAm848YGikCnibh4oDrP6EBe2+HGYVfQA8yaUDp7
+l79cdMGNH1/xo0mcjxybiyTscrUAJR9MAjdidlUi28uVy3zGvSXARzrkoPlyS1yC
+lVa96iValynpjui/T+opzxSnxncZufd4P/nC3N0Njo+VsuWLiMC9S3AZEXgwhUA=
+=W98D
 -----END PGP SIGNATURE-----