passenger 5.0.6 → 5.0.7

data/lib/phusion_passenger/constants.rb

@@ -87,6 +87,7 @@ module PhusionPassenger
     # Misc
     FEEDBACK_FD = 3
     PROGRAM_NAME = "Phusion Passenger"
+    SHORT_PROGRAM_NAME = "Passenger"
     SERVER_TOKEN_NAME = "Phusion_Passenger"
     FLYING_PASSENGER_NAME = "Flying Passenger"
     INDEX_DOC_URL       = "https://www.phusionpassenger.com/documentation/Users%20guide.html"

data/lib/phusion_passenger/loader_shared_helpers.rb

@@ -1,6 +1,6 @@
 # encoding: binary
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2011-2013 Phusion
+#  Copyright (c) 2011-2015 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -274,8 +274,7 @@ module PhusionPassenger
         # there's always the load_path_setup_file option and
         # setup_load_paths.rb.
         running_bundler(options) do
-          require 'rubygems'
-          require 'bundler/setup'
+          activate_gem 'bundler', 'bundler/setup'
         end
       end
 
@@ -376,6 +375,30 @@ module PhusionPassenger
       PhusionPassenger.call_event(:stopping_worker_process)
     end
 
+    # Activate a gem and require it. This method exists in order to load
+    # a library from RubyGems instead of from vendor_ruby. For example,
+    # on Debian systems, Rack may be installed from APT, but that is usually
+    # a very old version which we don't want. This method ensures that the
+    # RubyGems-installed version is loaded, not the the version in vendor_ruby.
+    # See the following threads for discussion:
+    # https://github.com/phusion/passenger/issues/1478
+    # https://github.com/phusion/passenger/issues/1480
+    def activate_gem(gem_name, library_name = nil)
+      if !defined?(::Gem)
+        begin
+          require 'rubygems'
+        rescue LoadError
+        end
+      end
+      if Kernel.respond_to?(:gem, true)
+        begin
+          gem(gem_name)
+        rescue Gem::LoadError
+        end
+      end
+      require(library_name || gem_name)
+    end
+
   private
     def running_bundler(options)
       yield

data/lib/phusion_passenger/nginx/config_options.rb

@@ -106,6 +106,10 @@ LOCATION_CONFIGURATION_OPTIONS = [
     :name  => 'passenger_nodejs',
     :type  => :string
   },
+  {
+    :name  => 'passenger_meteor_app_settings',
+    :type  => :string
+  },
   {
     :name  => 'passenger_app_env',
     :type  => :string,

data/lib/phusion_passenger/packaging.rb

@@ -127,14 +127,10 @@ module PhusionPassenger
       'Vagrantfile',
       'Passenger.sublime-project',
       'Passenger.xcodeproj/**/*',
-      'debian.template/**/*',
       'packaging/**/*',
       'test/**/*'
     ]
 
-    # Files that should be excluded from the Debian tarball.
-    DEBIAN_EXCLUDE_GLOB = []
-
     # Files and directories that should be excluded from the Homebrew installation.
     HOMEBREW_EXCLUDE = [
       "package.json", "npm-shrinkwrap.json"
@@ -145,10 +141,6 @@ module PhusionPassenger
       result.reject! { |path| path =~ %r{/\.\.?$} }
       result
     end
-
-    def self.debian_orig_tarball_files
-      files - Dir[*DEBIAN_EXCLUDE_GLOB]
-    end
   end
 
 end # module PhusionPassenger

data/lib/phusion_passenger/platform_info/apache.rb

@@ -1,6 +1,6 @@
 # encoding: binary
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2013 Phusion
+#  Copyright (c) 2010-2015 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -26,6 +26,7 @@ PhusionPassenger.require_passenger_lib 'platform_info'
 PhusionPassenger.require_passenger_lib 'platform_info/compiler'
 PhusionPassenger.require_passenger_lib 'platform_info/operating_system'
 PhusionPassenger.require_passenger_lib 'platform_info/linux'
+PhusionPassenger.require_passenger_lib 'utils/shellwords'
 
 module PhusionPassenger
 
@@ -101,47 +102,58 @@ module PhusionPassenger
     end
     memoize :httpd_version
 
-    # Run `httpd -V` and return its output. On some systems, such as Ubuntu 13.10,
-    # `httpd -V` fails without the environment variables defined in various scripts.
-    # Here we take care of evaluating those scripts before running `httpd -V`.
-    def self.httpd_V(options = nil)
+    # Run `apache2ctl -V` and return its output.
+    #
+    # We used to run `httpd -V`, but on systems like Ubuntu it depends on various
+    # environment variables or directories, wich apache2ctl loads or initializes.
+    def self.apache2ctl_V(options = nil)
       if options
-        httpd = options[:httpd] || self.httpd(options)
+        apache2ctl = options[:apache2ctl] || self.apache2ctl(options)
       else
-        httpd = self.httpd
+        apache2ctl = self.apache2ctl
       end
-      if httpd
-        command = "#{httpd} -V"
-        if envvars_file = httpd_envvars_file(options)
-          command = ". '#{envvars_file}' && #{command}"
+      if apache2ctl
+        create_temp_file("apache2ctl_V") do |filename, f|
+          e_filename = Shellwords.escape(filename)
+          output = `#{apache2ctl} -V 2>#{e_filename}`
+
+          stderr_text = File.open(filename, "rb") do |f2|
+            f2.read
+          end
+          # This stderr message shows up on Ubuntu. We ignore it.
+          stderr_text.sub!(/.*Could not reliably determine the server's fully qualified domain name.*\r?\n?/, "")
+          # But we print the rest of stderr.
+          STDERR.write(stderr_text)
+          STDERR.flush
+
+          output
         end
-        return `#{command}`
       else
-        return nil
+        nil
       end
     end
-    memoize :httpd_V
+    memoize :apache2ctl_V
 
     # The Apache executable's architectural bits. Returns 32 or 64,
     # or nil if unable to detect.
     def self.httpd_architecture_bits(options = nil)
       if options
-        httpd = options[:httpd] || self.httpd(options)
+        info = apache2ctl_V(options)
       else
-        httpd = self.httpd
+        info = apache2ctl_V
       end
-      if httpd
-        `#{httpd} -V` =~ %r{Architecture:(.*)}
+      if info
+        info =~ %r{Architecture:(.*)}
         text = $1
         if text =~ /32/
-          return 32
+          32
         elsif text =~ /64/
-          return 64
+          64
         else
-          return nil
+          nil
         end
       else
-        return nil
+        nil
       end
     end
     memoize :httpd_architecture_bits
@@ -150,9 +162,9 @@ module PhusionPassenger
     # This may be different from the value of the ServerRoot directive.
     def self.httpd_default_root(options = nil)
       if options
-        info = httpd_V(options)
+        info = apache2ctl_V(options)
       else
-        info = httpd_V
+        info = apache2ctl_V
       end
       if info
         info =~ / -D HTTPD_ROOT="(.+)"$/
@@ -166,9 +178,9 @@ module PhusionPassenger
     # The default Apache configuration file, or nil if Apache is not found.
     def self.httpd_default_config_file(options = nil)
       if options
-        info = httpd_V(options)
+        info = apache2ctl_V(options)
       else
-        info = httpd_V
+        info = apache2ctl_V
       end
       if info
         info =~ /-D SERVER_CONFIG_FILE="(.+)"$/
@@ -216,7 +228,7 @@ module PhusionPassenger
     # Returns nil if Apache is not detected, or if the default error log filename
     # cannot be detected.
     def self.httpd_default_error_log(options = nil)
-      if info = httpd_V(options)
+      if info = apache2ctl_V(options)
         info =~ /-D DEFAULT_ERRORLOG="(.+)"$/
         filename = $1
         if filename =~ /\A\//
@@ -263,7 +275,7 @@ module PhusionPassenger
         elsif contents =~ /ErrorLog/i
           # The user apparently has ErrorLog set somewhere but
           # we can't parse it. The default error log location,
-          # as reported by `httpd -V`, may be wrong (it is on OS X).
+          # as reported by `apache2ctl -V`, may be wrong (it is on OS X).
           # So to be safe, let's assume that we don't know.
           log "Unable to parse ErrorLog directive in Apache configuration file"
           return nil

data/lib/phusion_passenger/platform_info/apache_detector.rb

@@ -85,8 +85,9 @@ module PhusionPassenger
       attr_reader :results
 
       def initialize(output)
-        @output  = output
-        @results = []
+        @output   = output
+        @results  = []
+        @failures = 0
         PlatformInfo.verbose = true
         PlatformInfo.log_implementation = lambda do |message|
           if message =~ /: found$/
@@ -169,10 +170,31 @@ module PhusionPassenger
       end
 
       def report
+        if @failures > 0 && Process.uid != 0
+          user = `whoami`.strip
+          sudo_s_e = PhusionPassenger::PlatformInfo.ruby_sudo_shell_command("-E")
+          ruby = PhusionPassenger::PlatformInfo.ruby_command
+          log ""
+          log "----------------------------"
+          log ""
+          log "<red>Permission problems</red>"
+          log ""
+          log "Sorry, this program doesn't have enough permissions to autodetect all your"
+          log "Apache installations, because it's running as the <b>#{`whoami`.strip}</b> user."
+          log "Please re-run this program with root privileges:"
+          log ""
+          log "  <b>export ORIG_PATH=\"$PATH\"</b>"
+          log "  <b>#{sudo_s_e}</b>"
+          log "  <b>export PATH=\"$ORIG_PATH\"</b>"
+          log "  <b>#{ruby} #{PhusionPassenger.bin_dir}/passenger-config --detect-apache2</b>"
+          return
+        end
+
         log "<banner>Final autodetection results</banner>"
         @results.each do |result|
           result.report
         end
+
         if @results.empty?
           log "<red>Sorry, this program cannot find an Apache installation.</red>"
           log ""
@@ -223,7 +245,11 @@ module PhusionPassenger
 
       def add_result
         result = Result.new(self)
-        @results << result if yield(result)
+        if yield(result)
+          @results << result
+        else
+          @failures += 1
+        end
       end
     end
 

data/lib/phusion_passenger/rack/thread_handler_extension.rb

@@ -81,6 +81,10 @@ module PhusionPassenger
             end
           end
 
+          # Rails somehow modifies env['REQUEST_METHOD'], so we perform the comparison
+          # before the Rack application object is called.
+          is_head_request = env[REQUEST_METHOD] == HEAD
+
           begin
             status, headers, body = @app.call(env)
           rescue => e
@@ -101,7 +105,8 @@ module PhusionPassenger
           return true if env[RACK_HIJACK_IO]
 
           begin
-            process_body(env, connection, socket_wrapper, status.to_i, headers, body)
+            process_body(env, connection, socket_wrapper, status.to_i, is_head_request,
+              headers, body)
           rescue Exception => e
             disable_keep_alive
             raise
@@ -115,7 +120,7 @@ module PhusionPassenger
 
     private
       # The code here is ugly, but it's necessary for performance.
-      def process_body(env, connection, socket_wrapper, status, headers, body)
+      def process_body(env, connection, socket_wrapper, status, is_head_request, headers, body)
         if hijack_callback = headers[RACK_HIJACK]
           # Application requested a partial socket hijack.
           body = nil
@@ -132,7 +137,7 @@ module PhusionPassenger
           # object instead of a real Array, even when #is_a? claims so.
           # Call #to_a just to be sure.
           body = body.to_a
-          output_body = should_output_body?(status, env)
+          output_body = should_output_body?(status, is_head_request)
           headers_output = generate_headers_array(status, headers)
           perform_keep_alive(env, headers_output)
           if output_body && should_add_message_length_header?(status, headers)
@@ -150,7 +155,7 @@ module PhusionPassenger
           end
           false
         elsif body.is_a?(String)
-          output_body = should_output_body?(status, env)
+          output_body = should_output_body?(status, is_head_request)
           headers_output = generate_headers_array(status, headers)
           perform_keep_alive(env, headers_output)
           if output_body && should_add_message_length_header?(status, headers)
@@ -165,7 +170,7 @@ module PhusionPassenger
           connection.writev(headers_output)
           false
         else
-          output_body = should_output_body?(status, env)
+          output_body = should_output_body?(status, is_head_request)
           headers_output = generate_headers_array(status, headers)
           perform_keep_alive(env, headers_output)
           chunk = output_body && should_add_message_length_header?(status, headers)
@@ -240,10 +245,10 @@ module PhusionPassenger
         @keepalive_performed = false
       end
 
-      def should_output_body?(status, env)
+      def should_output_body?(status, is_head_request)
         return (status < 100 ||
           (status >= 200 && status != 204 && status != 205 && status != 304)) &&
-          env[REQUEST_METHOD] != HEAD
+          !is_head_request
       end
 
       def should_add_message_length_header?(status, headers)

data/lib/phusion_passenger/request_handler/thread_handler.rb

@@ -245,6 +245,11 @@ module PhusionPassenger
             request_method = $1
             request_uri    = $2
             protocol       = $3
+            if request_method.nil?
+              warn("*** Passenger RequestHandler warning: " <<
+                "Invalid HTTP request.")
+              return
+            end
             path_info, query_string    = request_uri.split("?", 2)
             headers[REQUEST_METHOD]    = request_method
             headers["REQUEST_URI"]     = request_uri

data/lib/phusion_passenger/standalone/start_command.rb

@@ -29,6 +29,7 @@ PhusionPassenger.require_passenger_lib 'standalone/command'
 PhusionPassenger.require_passenger_lib 'standalone/config_utils'
 PhusionPassenger.require_passenger_lib 'utils'
 PhusionPassenger.require_passenger_lib 'utils/tmpio'
+PhusionPassenger.require_passenger_lib 'platform_info/ruby'
 
 # We lazy load as many libraries as possible not only to improve startup performance,
 # but also to ensure that we don't require libraries before we've passed the dependency
@@ -73,20 +74,22 @@ module PhusionPassenger
           watch_log_files_in_background if should_watch_logs?
           wait_until_engine_has_exited if should_wait_until_engine_has_exited?
         rescue Interrupt
-          shutdown_and_cleanup(true)
+          trapsafe_shutdown_and_cleanup(true)
           exit 2
         rescue SignalException => signal
-          shutdown_and_cleanup(true)
+          trapsafe_shutdown_and_cleanup(true)
           if signal.message == 'SIGINT' || signal.message == 'SIGTERM'
             exit 2
           else
             raise
           end
         rescue Exception
-          shutdown_and_cleanup(true)
+          trapsafe_shutdown_and_cleanup(true)
           raise
         else
-          shutdown_and_cleanup(false)
+          trapsafe_shutdown_and_cleanup(false)
+        ensure
+          reset_traps_intterm
         end
       end
 
@@ -172,6 +175,19 @@ module PhusionPassenger
             "Default: #{DEFAULT_OPTIONS[:environment]}") do |value|
             options[:environment] = value
           end
+          opts.on("--ruby FILENAME", String, "Executable to use for Ruby apps#{nl}" +
+            "Default: " + PlatformInfo.ruby_command + " (current context)") do |value|
+            options[:ruby] = value
+          end
+          opts.on("--nodejs FILENAME", String, "Executable to use for NodeJs apps") do |value|
+            options[:nodejs] = value
+          end
+          opts.on("--python FILENAME", String, "Executable to use for Python apps") do |value|
+            options[:python] = value
+          end
+          opts.on("--meteor-app-settings FILENAME", String, "Settings file to use for (development mode) Meteor apps") do |value|
+            options[:meteor_app_settings] = value
+          end
           opts.on("-R", "--rackup FILE", String,
             "Consider application a Ruby app, and use#{nl}" +
             "the given rackup file") do |value|
@@ -704,7 +720,32 @@ module PhusionPassenger
 
       ################## Shut down and cleanup ##################
 
-      def shutdown_and_cleanup(error_occurred)
+      def capture_traps_intterm
+        return if @traps_captured
+        @traps_captured = 1
+        trap("INT", &method(:trapped_intterm))
+        trap("TERM", &method(:trapped_intterm))
+      end
+
+      def reset_traps_intterm
+        @traps_captured = nil
+        trap("INT", "DEFAULT")
+        trap("TERM", "DEFAULT")
+      end
+  
+      def trapped_intterm(signal)
+        if @traps_captured == 1
+          @traps_captured += 1
+          puts "Ignoring signal #{signal} during shutdown. Send it again to force exit."
+        else
+          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