passenger 5.0.27 → 5.0.28

data/src/nginx_module/Configuration.c

@@ -74,10 +74,12 @@ static ngx_int_t traverse_static_location_tree(ngx_conf_t *cf,
     ngx_http_core_srv_conf_t *server_conf,
     ngx_http_location_tree_node_t *node,
     postprocess_ctx_t *ctx);
+#ifdef NGX_PCRE
 static ngx_int_t traverse_regex_locations(ngx_conf_t *cf,
     ngx_http_core_srv_conf_t *server_conf,
     ngx_http_core_loc_conf_t **regex_locations,
     postprocess_ctx_t *ctx);
+#endif
 static ngx_int_t merge_headers(ngx_conf_t *cf, passenger_loc_conf_t *conf,
     passenger_loc_conf_t *prev);
 static ngx_int_t merge_string_array(ngx_conf_t *cf, ngx_array_t **prev,
@@ -1141,8 +1143,12 @@ traverse_location_confs_nested_in_server_conf(ngx_conf_t *cf,
         return result;
     }
 
+#ifdef NGX_PCRE
     return traverse_regex_locations(cf, server_conf,
         location_conf->regex_locations, ctx);
+#else
+    return result;
+#endif
 }
 
 static ngx_int_t
@@ -1185,6 +1191,7 @@ traverse_static_location_tree(ngx_conf_t *cf,
     return NGX_OK;
 }
 
+#ifdef NGX_PCRE
 static ngx_int_t
 traverse_regex_locations(ngx_conf_t *cf,
     ngx_http_core_srv_conf_t *server_conf,
@@ -1208,6 +1215,7 @@ traverse_regex_locations(ngx_conf_t *cf,
 
     return NGX_OK;
 }
+#endif
 
 static int
 string_keyval_has_key(ngx_array_t *table, ngx_str_t *key)

data/src/nginx_module/config

@@ -7,27 +7,36 @@ if ! ruby -v >/dev/null 2>/dev/null; then
 fi
 
 ## Magic comment: begin bootstrap ##
-# Ensure that this script finds the passenger-config that belongs to this Phusion Passenger installation.
+# Warning: this magic section will be replaced during packaging by the script in dev/install_scripts_bootstrap_code.rb,
+# so keep its purpose purely for finding the passenger-config that belongs to this Phusion Passenger installation.
 PATH="$ngx_addon_dir/../../bin:$PATH"
 export PATH
 
 PASSENGER_CONFIG=${PASSENGER_CONFIG:-passenger-config}
+BUILD_DIRECTIVE="nginx"
+COMPILE_CHECK_DIRECTIVE="--compiled"
 
-if test "x$PASSENGER_LIBS" = "x" && ! $PASSENGER_CONFIG --compiled; then
+if [ "$ngx_module_link" = DYNAMIC ]; then
+    BUILD_DIRECTIVE="nginx:as_dynamic_module"
+    COMPILE_CHECK_DIRECTIVE="--nginx-dynamic-compiled"
+fi
+
+# N.B. the compile check only looks at whether the common library objects are compiled and it assumes that
+# their presence indicates a good build was performed. If other essential files were manually deleted the
+# rake $BUILD_DIRECTIVE task (or rake clean) can be run manually to repair/reset the build.
+if test "x$PASSENGER_LIBS" = "x" && ! $PASSENGER_CONFIG $COMPILE_CHECK_DIRECTIVE; then
     echo "*** The Phusion Passenger support files are not yet compiled. Compiling them for you... ***"
-    echo "*** Running 'rake nginx CACHING=false' in $ngx_addon_dir... ***"
     old_dir=`pwd`
     if ! cd $ngx_addon_dir; then
         exit 1
     fi
-    if test "x$TRACE" = 1; then
-        if ! rake --trace nginx CACHING=false; then
-            exit 1
-        fi
-    else
-        if ! rake nginx CACHING=false; then
-            exit 1
-        fi
+    TRACE_DIRECTIVE=""
+    if test "x$TRACE" = "x1"; then
+        TRACE_DIRECTIVE="--trace"
+    fi
+    echo "*** Running 'rake $TRACE_DIRECTIVE $BUILD_DIRECTIVE CACHING=false' in $ngx_addon_dir... ***"
+    if ! rake $TRACE_DIRECTIVE $BUILD_DIRECTIVE CACHING=false; then
+        exit 1
     fi
     cd "$old_dir"
     echo "*** Phusion Passenger support files have been successfully compiled. ***"
@@ -37,8 +46,13 @@ fi
 if test "x$PASSENGER_INCLUDEDIR" = "x"; then
     PASSENGER_INCLUDEDIR=`$PASSENGER_CONFIG --includedir`
 fi
+
+LINK_DIRECTIVE="--nginx-libs"
+if [ "$ngx_module_link" = DYNAMIC ]; then
+    LINK_DIRECTIVE="--nginx-dynamic-libs"
+fi
 if test "x$PASSENGER_LIBS" = "x"; then
-    PASSENGER_LIBS=`$PASSENGER_CONFIG --nginx-libs`
+    PASSENGER_LIBS=`$PASSENGER_CONFIG $LINK_DIRECTIVE`
 fi
 
 PASSENGER_MODULE_INCS="$PASSENGER_INCLUDEDIR"

data/src/ruby_supportlib/phusion_passenger.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2015 Phusion Holding B.V.
+#  Copyright (c) 2010-2016 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.
@@ -31,10 +31,10 @@ module PhusionPassenger
 
   PACKAGE_NAME = 'passenger'
   # Run 'rake src/cxx_supportlib/Constants.h' after changing this number.
-  VERSION_STRING = '5.0.27'
+  VERSION_STRING = '5.0.28'
 
-  PREFERRED_NGINX_VERSION = '1.8.1'
-  NGINX_SHA256_CHECKSUM = '8f4b3c630966c044ec72715754334d1fdf741caa1d5795fb4646c27d09f797b7'
+  PREFERRED_NGINX_VERSION = '1.10.0'
+  NGINX_SHA256_CHECKSUM = '8ed647c3dd65bc4ced03b0e0f6bf9e633eff6b01bac772bcf97077d58bc2be4d'
 
   PREFERRED_PCRE_VERSION  = '8.34'
   PCRE_SHA256_CHECKSUM = '1dd78994c81e44ac41cf30b2a21d4b4cc6d76ccde7fc6e77713ed51d7bddca47'
@@ -235,15 +235,15 @@ module PhusionPassenger
     require("#{ruby_libdir}/phusion_passenger/#{name}")
   end
 
-  # Forward define public_api.rb methods for code that tries to hook 
+  # Forward define public_api.rb methods for code that tries to hook
   # Passenger events before an app is spawned (such as mongoid)
-  def on_event(name, &block)
+  def self.on_event(name, &block)
     # The definition in `public_api.rb` will override this implementation when
     # a Ruby application is spawned.
     nil
   end
-  
-  def call_event(name, *args)
+
+  def self.call_event(name, *args)
     # The definition in `public_api.rb` will override this implementation when
     # a Ruby application is spawned.
     nil

data/src/ruby_supportlib/phusion_passenger/admin_tools/memory_stats.rb

@@ -90,7 +90,7 @@ module PhusionPassenger
       # Phusion Passenger is not running.
       def passenger_processes
         @passenger_processes ||= list_processes(:match =>
-          /((^| )Passenger|(^| )Rails:|(^| )Rack:|wsgi-loader.py)/)
+          /((^| )Passenger|(^| )Rails:|(^| )Rack:|wsgi-loader.py|(.*)PassengerAgent)/)
       end
 
       # Returns the sum of the memory usages of all given processes.

data/src/ruby_supportlib/phusion_passenger/apache2/config_options.rb

@@ -228,6 +228,14 @@ APACHE2_DIRECTORY_CONFIGURATION_OPTIONS = [
     :desc     => "Force #{SHORT_PROGRAM_NAME} to believe that an application process " \
                  "can handle the given number of concurrent requests per process"
   },
+  {
+    :name      => "PassengerLveMinUid",
+    :type      => :integer,
+    :min_value => 0,
+    :context   => ["RSRC_CONF"],
+    :desc      => "Minimum user id starting from which entering LVE and CageFS is allowed."
+  },
+
 
   ##### Aliases #####
 

data/src/ruby_supportlib/phusion_passenger/common_library.rb

@@ -78,7 +78,7 @@ class CommonLibraryBuilder
     result = []
 
     selected_categories.each do |category|
-      object_names = selected_objects_beloging_to_category(category)
+      object_names = selected_objects_belonging_to_category(category)
       result.concat(object_filenames_for(object_names))
     end
 
@@ -231,7 +231,7 @@ private
     return expected == actual
   end
 
-  def selected_objects_beloging_to_category(category)
+  def selected_objects_belonging_to_category(category)
     result = []
     @selected_components.each_pair do |object_name, options|
       if options[:category] == category

data/src/ruby_supportlib/phusion_passenger/config/about_command.rb

@@ -39,7 +39,12 @@ module PhusionPassenger
         puts "  ruby-libdir              Show #{PROGRAM_NAME}'s Ruby library directory."
         puts "  includedir               Show the Nginx runtime library headers directory."
         puts "  nginx-addon-dir          Show #{PROGRAM_NAME}'s Nginx addon directory."
-        puts "  nginx-libs               Show Nginx runtime library flags."
+        puts "  nginx-libs               Show paths to #{PROGRAM_NAME}'s libraries" 
+        puts "                           for static linking to Nginx runtime."
+        puts "  nginx-dynamic-libs       Show paths to #{PROGRAM_NAME}'s libraries" 
+        puts "                           for dynamic linking to Nginx runtime."
+        puts "  nginx-dynamic-compiled   Check whether runtime libraries for dynamic"
+        puts "                           linking to Nginx are compiled."
         puts "  resourcesdir             Show #{PROGRAM_NAME}'s resources directory."
         puts "  support-binaries-dir     Show #{PROGRAM_NAME}'s support binaries dir."
         puts "  compiled                 Check whether runtime libraries are compiled."
@@ -77,6 +82,8 @@ module PhusionPassenger
           puts PhusionPassenger.nginx_module_source_dir
         when "--nginx-libs"
           puts "#{common_library.link_objects_as_string} #{PhusionPassenger.lib_dir}/common/libboost_oxt.a"
+        when "--nginx-dynamic-libs"
+          puts "#{common_dynamic_library.link_objects_as_string} #{PhusionPassenger.lib_dir}/nginx_dynamic/libboost_oxt.a"
         when "--resourcesdir"
           puts PhusionPassenger.resources_dir
         when "--support-binaries-dir"
@@ -92,6 +99,17 @@ module PhusionPassenger
           else
             exit 1
           end
+        when "--nginx-dynamic-compiled"
+          common_dynamic_library.link_objects.each do |filename|
+            if !File.exist?(filename)
+              exit 1
+            end
+          end
+          if File.exist?("#{PhusionPassenger.lib_dir}/nginx_dynamic/libboost_oxt.a")
+            exit 0
+          else
+            exit 1
+          end
         when "--custom-packaged"
           if PhusionPassenger.custom_packaged?
             exit 0
@@ -200,6 +218,13 @@ module PhusionPassenger
           only(*NGINX_LIBS_SELECTOR).
           set_output_dir("#{PhusionPassenger.lib_dir}/common/libpassenger_common")
       end
+      
+      def common_dynamic_library
+        PhusionPassenger.require_passenger_lib 'common_library'
+        return COMMON_LIBRARY.
+          only(*NGINX_LIBS_SELECTOR).
+          set_output_dir("#{PhusionPassenger.lib_dir}/nginx_dynamic/module_libpassenger_common")
+      end
     end
 
   end # module Config

data/src/ruby_supportlib/phusion_passenger/config/main.rb

@@ -53,6 +53,8 @@ module PhusionPassenger
       "includedir",
       "nginx-addon-dir",
       "nginx-libs",
+      "nginx-dynamic-libs",
+      "nginx-dynamic-compiled",
       "compiled",
       "custom-packaged",
       "installed-from-release-package",

data/src/ruby_supportlib/phusion_passenger/constants.rb

@@ -70,6 +70,7 @@ module PhusionPassenger
     DEFAULT_UNION_STATION_GATEWAY_PORT = 443
     DEFAULT_HTTP_SERVER_LISTEN_ADDRESS = "tcp://127.0.0.1:3000"
     DEFAULT_UST_ROUTER_LISTEN_ADDRESS = "tcp://127.0.0.1:9344"
+    DEFAULT_LVE_MIN_UID = 500
 
     # Size limits
     MESSAGE_SERVER_MAX_USERNAME_SIZE = 100

data/src/ruby_supportlib/phusion_passenger/packaging.rb

@@ -82,7 +82,7 @@ module PhusionPassenger
       'package.json',
       'npm-shrinkwrap.json',
       'passenger.gemspec',
-      'build/*',
+      'build/**/*',
       'bin/*',
       'doc/**/*',
       'man/*',

data/src/ruby_supportlib/phusion_passenger/platform_info/cxx_portability.rb

@@ -211,6 +211,7 @@ module PhusionPassenger
       end
       result << ' -lrt' if has_rt_library?
       result << ' -lmath' if has_math_library?
+      result << ' -ldl'
       result.strip!
       return result
     end

data/src/ruby_supportlib/phusion_passenger/standalone/start_command/nginx_engine.rb

@@ -258,7 +258,7 @@ module PhusionPassenger
           end
         end
 
-        # Method exists for backward compatiblity with old Nginx config templates
+        # Method exists for backward compatibility with old Nginx config templates
         def boolean_config_value(val)
           val ? "on" : "off"
         end

data/src/ruby_supportlib/phusion_passenger/vendor/crash_watch/gdb_controller.rb

@@ -328,7 +328,8 @@ module CrashWatch
         end
       elsif result.nil?
         raise GdbNotFound,
-          "*** ERROR ***: 'gdb' isn't installed. Please install it first.\n" +
+          "*** ERROR ***: 'gdb' not found. Please install it (and if using Nginx " + 
+          "ensure that PATH isn't filtered out, see also its \"env\" option).\n" +
           "       Debian/Ubuntu: sudo apt-get install gdb\n" +
           "RedHat/CentOS/Fedora: sudo yum install gdb\n" +
           "            Mac OS X: please install the Developer Tools or XCode\n" +

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passenger
 version: !ruby/object:Gem::Version
-  version: 5.0.27
+  version: 5.0.28
 platform: ruby
 authors:
 - Phusion - http://www.phusion.nl/
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-06 00:00:00.000000000 Z
+date: 2016-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -71,8 +71,6 @@ files:
 - build/apache2.rb
 - build/basics.rb
 - build/common_library.rb
-- build/cplusplus_support.rb
-- build/cxx_dependency_map.rb
 - build/cxx_tests.rb
 - build/documentation.rb
 - build/integration_tests.rb
@@ -83,6 +81,9 @@ files:
 - build/packaging.rb
 - build/ruby_extension.rb
 - build/ruby_tests.rb
+- build/support/cplusplus.rb
+- build/support/cxx_dependency_map.rb
+- build/support/general.rb
 - build/test_basics.rb
 - configure
 - dev/ci/inituidgid
@@ -407,6 +408,7 @@ files:
 - src/cxx_supportlib/Integrations/LibevJsonUtils.h
 - src/cxx_supportlib/Logging.cpp
 - src/cxx_supportlib/Logging.h
+- src/cxx_supportlib/LveLoggingDecorator.h
 - src/cxx_supportlib/MemoryKit/mbuf.cpp
 - src/cxx_supportlib/MemoryKit/mbuf.h
 - src/cxx_supportlib/MemoryKit/palloc.cpp
@@ -511,6 +513,7 @@ files:
 - src/cxx_supportlib/oxt/system_calls.hpp
 - src/cxx_supportlib/oxt/thread.hpp
 - src/cxx_supportlib/oxt/tracable_exception.hpp
+- src/cxx_supportlib/vendor-copy/adhoc_lve.h
 - src/cxx_supportlib/vendor-copy/libuv/AUTHORS
 - src/cxx_supportlib/vendor-copy/libuv/ChangeLog
 - src/cxx_supportlib/vendor-copy/libuv/LICENSE