passenger 5.0.13 → 5.0.14

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWNmODU4ZmM3Zjk1YjliNGU3MWNlZmQyMzNkMmJmMzNkNWU3YzdjMg==
+    ZTUyMzc2Mjc1MzllNDY0ZDM0M2I2YjIyNjYxN2U3MTEwNjc4ODNlOQ==
   data.tar.gz: !binary |-
-    YjlkZmM4YTUxZWNjMmE2YTY1OTJjZTllMjgwZWFiNmY2MGVlNDJjNw==
+    ODVlYTIxYzU5ODRiMDY2YTlmYTk5MGE1ODY0ZTIwNGQzMDkzMWE0NQ==
 SHA512:
   metadata.gz: !binary |-
-    NDc5YTA5MjRjOTdiZDlkNGIyN2EyZDcxOTFiNzcyYWU5ZjY4OWMyZWQ0YjBj
-    NmY4ZjMxNzY0ZDIwMDQwOWQ4OWE3NTFlZTZiZGFjNTg3Yzk2ZTQ5MGNkZDI0
-    MWM0MTBkYWM5NTRhNzYzM2NjMjc1YzMwYmFiYjM2MzI3ODVlNDg=
+    ZGYxMGIwZDI1MTZkYjI0MmY2NjgyOTM3ZjUzZjg5YmJmMjZlOWI4YjBlMzgz
+    ODEyOGU0NDY3ODA5MmFmZWE1N2U5ZWMzYzY1MTczMGY5ODQ2ZjEwNWMyNjAx
+    NGI0YjgxMGY2Yjk5ZjRiMjM2OTgwN2RmOTFkOWRhM2VlMjc1OGM=
   data.tar.gz: !binary |-
-    YzJiNmM4Y2FjOTM4ZTk3NDZlYTA3Y2I5MmEzODMyYzQ0Y2QyZDlmNDkzODY3
-    MTQ2NDRmZTA4YjM5M2I5ZGYyNzE4Mzk0NGNjMWNjZTQwZWVjM2U4Yzc3ZWY0
-    NTliODY0ZDFmODNlMmMxNDg3MDliYTFjMGFiYTM4N2ZmNmMxOGM=
+    NGI3MTllM2JlOTQ3MjI1MzZmM2ZmMjdlNGQwMzQ1ZTRkOTcwZTc0OTU3MDgx
+    ZjA4NTJkMWU3YTdiYmQ2Y2VhNWFlNjZmOWI5N2NiZjViODBlZGQ5YzU4OWYw
+    MzgzMzVmNzQ4Y2UzM2YzM2JiZmJjMTNjOWQ4MGY0OGRkMmI2YmY=

checksums.yaml.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJVlbSXAAoJECrHRaUKISqMnY4H/0mq05PDibFb5mZEoNx2fxAX
-3EZiHtDSMvgnMTDYVcUVQlXZlBHZMgUdkjTzNNhbzy2+/rjJDOhwK6qrWUXBoS4T
-uoOBcjGjrAQewkbjgBTLXUl8lFn7ZPK9NbaoHKqcrEtCyCFGpRTZe5aK3g4+/VAj
-ml4lZ1ANC1MET22SYR4/FNTu6jH+upUJKZlkNWuFq/7BcNrwGbOFVtp+9jnm699a
-yXnNpPGVcgba+5Zxvzs7gTPq62ReaBYhOB4iW2G7i5xl4Hz8wCKggA/YxdCAT1Dw
-Qm6acCJt85Fjanf1I46GSGBA5WurDadX7NwFw3MdrSHsizbDIw1PoBDNID8CCTY=
-=b/iP
+iQEcBAABAgAGBQJVpfw2AAoJECrHRaUKISqMNQ0IALwBrQrKoKjMGWtIShDJkcnO
+pyySi3t1XAFoAyedHVCNu85k4EzRFX4AdzCys2xutG348CKa0LmPoluGM1xeTvk/
+zrbVmRuMOt/7syef+9uqdVR3dcUrlqg0QoS5ysWFpjk4WX/RM7pcbVylx4NM5n/x
+A+uJFlvjzA18p6Teoos8LwRDfdywyQEKfthiAEqN/RPeOBl9AoZ9EyCZb4bHOjfx
+5unb5UlaxiaZa+MQgjbXq5kjwvgsgykWh1U8fcWxoUs7c/Oxtt0FoOOdoSb7c6fU
+tFlw4e642szl49RcOk8soj+tgOcUQYOpbyoZ9nlUqCesOvsOr6YnMdcAWh48Ql8=
+=hqMn
 -----END PGP SIGNATURE-----

data.tar.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJVlbSXAAoJECrHRaUKISqMvv0H/3EdFquHBvaanNXhPdyGC3BJ
-N9IgjHe9PrHrrAATNAWOeGeiLzeiusWWm1t4SHfMsTfY7u7YICQBVkMvum/JQiZY
-E1ms/79bBHz7oeDq9J5PAlmqXCZZ8KGg3eNlVJm3ASZIydjL+8i0EciQcrDpYiMV
-5daAummZTuS932whowpdIYd0zqdtqIKtlRq6IVYrhPGfSiIDCSjVMEkf4gl1uhKx
-hzyGkGPIg4XUKhjPpiddAVlahiWdshDiytxXV4qeholJycXjZYAUL0DxLgkOyU1F
-9yCM2r5uXB/pQpwo+sOFgrjDSUr3zYkO3uMUUogO78rOIgcnJ2WMXZTz/0Oo2TM=
-=VV1v
+iQEcBAABAgAGBQJVpfw1AAoJECrHRaUKISqM2AAH/0H0z/5TLWyFnWd3ZipZ5yX/
+Ls373qV5k+PaHBHjHDti7d+/nRXFVXFTxbRRDbxuHvX7s/7o6yuligBKJTG9H5NQ
+JZ4ezdeq03WVzmuLuR/yw3vN1yCm85ouQY94HwTrxK/v6NQJn/qXro/47oDwp2h4
+b0FNsHfSDx2d8t91nyX+MRxdJzQ78d2Q36V/1usRHQcupxxMFd2AkW7KGc+OSaM4
+hREU8tsMgCDBcxTmFEsgwpOa8vGQG835PZvDEXDvw7SflKQhx6GV2lOhHJh5fMWN
+m0qyEdmM8nzfTU8oPI/51oMUAEh9kmWKrpkWrHU9cVdVunjPi9vpoxVOAOTY3WA=
+=NoNs
 -----END PGP SIGNATURE-----

data/CHANGELOG

@@ -1,7 +1,19 @@
+Release 5.0.14
+--------------
+
+ * [Standalone] Relative path handling has been improved. In previous versions, relative paths were not handled in a consistent manner. Relative paths are now handled consistently according to the following rules:
+
+   - If a relative path is given via a command line option, then it is relative to the current working directory.
+   - If a relative path is given via Passengerfile.json, then it is relative to Passengerfile.json.
+
+   Closes GH-1557.
+ * [Standalone] The `--disable-turbocaching` now works with the Nginx engine.
+
+
 Release 5.0.13
 --------------
 
- * The `passenger-config restart-app` command now supports the option `--ignore-passenger-not-running`. If this option is given, the command will exit normally instead of exiting with an error, if Passenger is not running. This option is useful in deployments involving Passenger Standalone. In an initial deployment, Passenger Standalone may not yet be running. Passenger this option allows you to ignore that issue.
+ * The `passenger-config restart-app` command now supports the option `--ignore-passenger-not-running`. If this option is given, the command will exit normally instead of exiting with an error, if Passenger is not running. This option is useful in deployments involving Passenger Standalone. In an initial deployment, Passenger Standalone may not yet be running. Passing this option allows you to ignore that issue.
  * SELinux policy issues in the RPMs have been fixed.
  * [Apache] `passenger-config reopen-logs` didn't work on Apache unless you explicitly set `PassengerLogFile`. This has now been fixed.
  * [Standalone] Due to some internal refactorings, the Passenger Standalone Nginx configuration template has changed. If you used a custom Nginx configuration template, please merge our latest changes into it.

data/ext/common/Constants.h

@@ -124,7 +124,7 @@
 
 	#define PASSENGER_DEFAULT_USER "nobody"
 
-	#define PASSENGER_VERSION "5.0.13"
+	#define PASSENGER_VERSION "5.0.14"
 
 	#define POOL_HELPER_THREAD_STACK_SIZE 262144
 

data/lib/phusion_passenger.rb

@@ -30,7 +30,7 @@ module PhusionPassenger
 
   PACKAGE_NAME = 'passenger'
   # Run 'rake ext/common/Constants.h' after changing this number.
-  VERSION_STRING = '5.0.13'
+  VERSION_STRING = '5.0.14'
 
   PREFERRED_NGINX_VERSION = '1.8.0'
   NGINX_SHA256_CHECKSUM = '23cca1239990c818d8f6da118320c4979aadf5386deda691b1b7c2c96b9df3d5'

data/lib/phusion_passenger/standalone/app_finder.rb

@@ -52,6 +52,10 @@ module PhusionPassenger
           end
       end
 
+      def self.supports_multi?
+        false
+      end
+
       def initialize(dirs, options = {})
         @dirs = dirs
         @options = options.dup
@@ -168,9 +172,11 @@ module PhusionPassenger
       def determine_mode_and_execution_root(options)
         @mode = :single
         if @dirs.empty?
-          @execution_root = File.absolute_path_no_resolve(".")
-        else
+          @execution_root = Dir.pwd_no_resolve
+        elsif @dirs.size == 1
           @execution_root = File.absolute_path_no_resolve(@dirs[0])
+        else
+          @execution_root = Dir.pwd_no_resolve
         end
       end
 

data/lib/phusion_passenger/standalone/config_utils.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2014 Phusion
+#  Copyright (c) 2014-2015 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -21,6 +21,8 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
+PhusionPassenger.require_passenger_lib 'ruby_core_enhancements'
+
 module PhusionPassenger
   module Standalone
 
@@ -79,7 +81,27 @@ module PhusionPassenger
         config.each_pair do |key, val|
           result[key.to_sym] = val
         end
-        return result
+
+        resolve_config_file_paths(result, filename)
+
+        result
+      end
+
+      # Absolutize relative paths. Make them relative to the config file in which
+      # it's specified.
+      def resolve_config_file_paths(config_file_options, config_filename)
+        options = config_file_options
+        config_file_dir = File.dirname(File.absolute_path_no_resolve(config_filename))
+
+        keys = [:socket_file, :ssl_certificate, :ssl_certificate_key, :log_file,
+          :pid_file, :instance_registry_dir, :data_buffer_dir, :meteor_app_settings,
+          :rackup, :startup_file, :static_files_dir, :restart_dir,
+          :nginx_config_template]
+        keys.each do |key|
+          if filename = options[key]
+            options[key] = File.expand_path(filename, config_file_dir)
+          end
+        end
       end
     end
 

data/lib/phusion_passenger/standalone/start_command.rb

@@ -31,9 +31,21 @@ PhusionPassenger.require_passenger_lib 'utils'
 PhusionPassenger.require_passenger_lib 'utils/tmpio'
 PhusionPassenger.require_passenger_lib 'platform_info/ruby'
 
+# ## Coding notes
+#
+# ### Lazy library loading
+#
 # 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
 # checking stage of the runtime installer.
+#
+# ### Path handling
+#
+# Handle paths as follows so that the behavior complies with the documentation:
+# - Immediately absolutize all paths in the option parser, so that relative paths passed
+#   through the command line are relative to the current working directory.
+# - Add the path's option key to ConfigUtils#resolve_config_file_paths so that relative
+#   paths in Passengerfile.json are absolutized relative to Passengerfile.json.
 
 module PhusionPassenger
   module Standalone
@@ -122,7 +134,7 @@ module PhusionPassenger
           opts.on("-S", "--socket FILE", String,
             "Bind to Unix domain socket instead of TCP#{nl}" +
             "socket") do |value|
-            options[:socket_file] = value
+            options[:socket_file] = File.absolute_path_no_resolve(value)
           end
           opts.on("--ssl", "Enable SSL support (Nginx#{nl}" +
             "engine only)") do
@@ -160,13 +172,11 @@ module PhusionPassenger
           end
           opts.on("--instance-registry-dir PATH", String,
             "Use the given instance registry directory") do |value|
-              # relative values OK
-              options[:instance_registry_dir] = value
+            options[:instance_registry_dir] = File.absolute_path_no_resolve(value)
           end
           opts.on("--data-buffer-dir PATH", String,
             "Use the given data buffer directory") do |value|
-            # relative values OK (absolutizePath in Passenger core main)
-            options[:data_buffer_dir] = value
+            options[:data_buffer_dir] = File.absolute_path_no_resolve(value)
           end
 
           opts.separator ""
@@ -186,15 +196,15 @@ module PhusionPassenger
           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
+          opts.on("--meteor-app-settings FILENAME", String,
+            "Settings file to use for (development mode) Meteor apps") do |value|
+            options[:meteor_app_settings] = File.absolute_path_no_resolve(value)
           end
           opts.on("-R", "--rackup FILE", String,
             "Consider application a Ruby app, and use#{nl}" +
             "the given rackup file") do |value|
             options[:app_type] = "rack"
-            # relative w.r.t. app dir
-            options[:startup_file] = value
+            options[:startup_file] = File.absolute_path_no_resolve(value)
           end
           opts.on("--app-type NAME", String,
             "Force app to be detected as the given type") do |value|
@@ -202,8 +212,7 @@ module PhusionPassenger
           end
           opts.on("--startup-file FILENAME", String,
             "Force given startup file to be used") do |value|
-            # relative w.r.t. app dir
-            options[:startup_file] = value
+            options[:startup_file] = File.absolute_path_no_resolve(value)
           end
           opts.on("--spawn-method NAME", String,
             "The spawn method to use. Default: #{DEFAULT_OPTIONS[:spawn_method]}") do |value|
@@ -318,8 +327,7 @@ module PhusionPassenger
           opts.separator ""
           opts.separator "Nginx engine options:"
           opts.on("--nginx-bin FILENAME", String, "Nginx binary to use as core") do |value|
-            # relative values OK
-            options[:nginx_bin] = value
+            options[:nginx_bin] = File.absolute_path_no_resolve(value)
           end
           opts.on("--nginx-version VERSION", String,
             "Nginx version to use as core.#{nl}" +
@@ -414,9 +422,17 @@ module PhusionPassenger
           merge(@global_options).
           merge(@local_options).
           merge(@parsed_options)
+        @options.delete(:config_filename)
       end
 
       def sanity_check_options_and_set_defaults
+        if @argv.size > 1
+          PhusionPassenger.require_passenger_lib 'standalone/app_finder'
+          if !AppFinder.supports_multi?
+            abort "You can only specify a single application directory as argument."
+          end
+        end
+
         if (@options[:address] || @options[:port]) && @options[:socket_file]
           abort "You cannot specify both --address/--port and --socket. Please choose either one."
         end
@@ -561,9 +577,6 @@ module PhusionPassenger
         else
           options[:log_file] ||= "#{exec_root}/#{log_basename}"
         end
-
-        options[:log_file] = File.expand_path(options[:log_file], exec_root)
-        options[:pid_file] = File.expand_path(options[:pid_file], exec_root)
       end
 
       def create_working_dir

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

@@ -161,8 +161,16 @@ module PhusionPassenger
         end
 
         def nginx_option(nginx_config_name, option_name)
-          if @options[option_name]
-            return "#{nginx_config_name} #{@options[option_name]};"
+          if @options.has_key?(option_name)
+            value = @options[option_name]
+            if value.is_a?(String)
+              value = "'#{value}'"
+            elsif value == true
+              value = "on"
+            elsif value == false
+              value = "off"
+            end
+            "#{nginx_config_name} #{value};"
           end
         end
 

data/resources/templates/standalone/config.erb

@@ -65,6 +65,7 @@ http {
     <%= nginx_option :passenger_min_instances, :min_instances %>
     <%= nginx_option :passenger_pool_idle_time, :pool_idle_time %>
     <%= nginx_option :passenger_max_preloader_idle_time, :max_preloader_idle_time %>
+    <%= nginx_option :passenger_turbocaching, :turbocaching %>
     <% 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.13
+  version: 5.0.14
 platform: ruby
 authors:
 - Phusion - http://www.phusion.nl/
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-02 00:00:00.000000000 Z
+date: 2015-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake

metadata.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJVlbSXAAoJECrHRaUKISqMi64H/iywK6Kt+04DltbH1fGq/7w1
-L3RonHItoOovzPQ7hE31/7STmbOQ2NcV2pMBIRG6Ble4Oywtk2bAPEIGkHCiUg+e
-Tq2hAOJwnRZQmO2AqV7Hm1R/Ec75gDwuRsqz7sCSkCm9kMR7LK+G4T4/SFfvlpNf
-pxh8aL5B06bvIM2LOE9lxYA6JgpS7aTRDe2WiAoU3vvVOc0QyWCm8aj0AKGn8kKc
-KRsZtYkQ64+kReRuFbu/WymDTYXDDVZ1xQiRjaU/2ZD2Xw8giA+/p2WXoSEuy9kk
-2WBtDeMoeVSKMx7mgm/4ZWubOH2KON/OPoDQ20oDD/N8nXQkVKUcrWSPxi5B76I=
-=ZTHP
+iQEcBAABAgAGBQJVpfw1AAoJECrHRaUKISqMdgUIAKy+YhJ/5jPmrfbgQikv7w6i
+0oIP8NPv7Wo213leBFScsYtbt5KLGCFAKRryfCevlzVLRLG/id+cmP/gjoV0T/v/
+cibFLMmbcR+lDzgda9xxsKiG38JmV2wU0QMOKuqfYFNNo5XY3VK8sCOXtlZYX9uw
+p+9ZGJciq7xxd8QhN0zYWdf7vyFHPONYv3cPsaRUGwJAP4ntxz7pa+/0opxbkYxs
+K+IrBNqyGnu8C8RBx0HtzPKfBvA/V9eSrrat3LS+UsB/y+93ZMQKIF1RUx65Hub0
++s6r+cR5Zs/CtIAproOGHofw+/r7w778kO5n7/IU0Bso5NykUY+712XzGmz2cqA=
+=DFtv
 -----END PGP SIGNATURE-----