passenger 5.1.10 → 5.1.11

data/src/cxx_supportlib/vendor-modified/jsoncpp/jsoncpp.cpp

@@ -108,6 +108,7 @@ license you like.
  * It is an internal header that must not be exposed.
  */
 
+namespace Passenger {
 namespace Json {
 static char getDecimalPoint() {
 #ifdef JSONCPP_NO_LOCALE_SUPPORT
@@ -199,7 +200,7 @@ static inline void fixNumericLocaleInput(char* begin, char* end) {
 }
 
 } // namespace Json {
-
+} // namespace Passenger
 #endif // LIB_JSONCPP_JSON_TOOL_H_INCLUDED
 
 // //////////////////////////////////////////////////////////////////////
@@ -268,7 +269,7 @@ static inline void fixNumericLocaleInput(char* begin, char* end) {
 #endif
 
 static size_t const stackLimit_g = JSONCPP_DEPRECATED_STACK_LIMIT; // see readValue()
-
+namespace Passenger {
 namespace Json {
 
 #if __cplusplus >= 201103L || (defined(_CPPLIB_VER) && _CPPLIB_VER >= 520)
@@ -2251,7 +2252,7 @@ JSONCPP_ISTREAM& operator>>(JSONCPP_ISTREAM& sin, Value& root) {
 }
 
 } // namespace Json
-
+} // namespace Passenger
 // //////////////////////////////////////////////////////////////////////
 // End of content of file: src/lib_json/json_reader.cpp
 // //////////////////////////////////////////////////////////////////////
@@ -2272,6 +2273,7 @@ JSONCPP_ISTREAM& operator>>(JSONCPP_ISTREAM& sin, Value& root) {
 
 // included by json_value.cpp
 
+namespace Passenger {
 namespace Json {
 
 // //////////////////////////////////////////////////////////////////
@@ -2432,7 +2434,7 @@ ValueIterator& ValueIterator::operator=(const SelfType& other) {
 }
 
 } // namespace Json
-
+} // namespace Passenger
 // //////////////////////////////////////////////////////////////////////
 // End of content of file: src/lib_json/json_valueiterator.inl
 // //////////////////////////////////////////////////////////////////////
@@ -2469,6 +2471,7 @@ ValueIterator& ValueIterator::operator=(const SelfType& other) {
 
 #define JSON_ASSERT_UNREACHABLE assert(false)
 
+namespace Passenger {
 namespace Json {
 
 // This is a walkaround to avoid the static initialization of Value::null.
@@ -2623,6 +2626,7 @@ static inline void releaseStringValue(char* value, unsigned) {
 #endif // JSONCPP_USING_SECURE_MEMORY
 
 } // namespace Json
+} // namespace Passenger
 
 // //////////////////////////////////////////////////////////////////
 // //////////////////////////////////////////////////////////////////
@@ -2636,6 +2640,7 @@ static inline void releaseStringValue(char* value, unsigned) {
 #include "json_valueiterator.inl"
 #endif // if !defined(JSON_IS_AMALGAMATION)
 
+namespace Passenger {
 namespace Json {
 
 Exception::Exception(JSONCPP_STRING const& msg)
@@ -4076,6 +4081,7 @@ Value& Path::make(Value& root) const {
 }
 
 } // namespace Json
+} // namespace Passenger
 
 // //////////////////////////////////////////////////////////////////////
 // End of content of file: src/lib_json/json_value.cpp
@@ -4165,6 +4171,7 @@ Value& Path::make(Value& root) const {
 #pragma warning(disable : 4996)
 #endif
 
+namespace Passenger {
 namespace Json {
 
 #if __cplusplus >= 201103L || (defined(_CPPLIB_VER) && _CPPLIB_VER >= 520)
@@ -5313,12 +5320,8 @@ JSONCPP_OSTREAM& operator<<(JSONCPP_OSTREAM& sout, Value const& root) {
 }
 
 } // namespace Json
+} // namespace Passenger
 
 // //////////////////////////////////////////////////////////////////////
 // End of content of file: src/lib_json/json_writer.cpp
 // //////////////////////////////////////////////////////////////////////
-
-
-
-
-

data/src/cxx_supportlib/vendor-modified/libev/ev++.h

@@ -352,7 +352,7 @@ namespace ev {
   struct dynamic_loop : loop_ref
   {
 
-    dynamic_loop (unsigned int flags = AUTO) throw (bad_loop)
+    dynamic_loop (unsigned int flags = AUTO)
     : loop_ref (ev_loop_new (flags))
     {
       if (!EV_AX)
@@ -376,7 +376,7 @@ namespace ev {
 
   struct default_loop : loop_ref
   {
-    default_loop (unsigned int flags = AUTO) throw (bad_loop)
+    default_loop (unsigned int flags = AUTO)
 #if EV_MULTIPLICITY
     : loop_ref (ev_default_loop (flags))
 #endif
@@ -552,12 +552,12 @@ namespace ev {
     return ev_embeddable_backends ();
   }
 
-  inline void set_allocator (void *(*cb)(void *ptr, long size) throw ()) throw ()
+  inline void set_allocator (void *(*cb)(void *ptr, long size)) throw ()
   {
     ev_set_allocator (cb);
   }
 
-  inline void set_syserr_cb (void (*cb)(const char *msg) throw ()) throw ()
+  inline void set_syserr_cb (void (*cb)(const char *msg)) throw ()
   {
     ev_set_syserr_cb (cb);
   }

data/src/cxx_supportlib/vendor-modified/libev/ev.h

@@ -542,13 +542,13 @@ EV_API_DECL void ev_sleep (ev_tstamp delay) EV_THROW; /* sleep for a while */
  * or take some potentially destructive action.
  * The default is your system realloc function.
  */
-EV_API_DECL void ev_set_allocator (void *(*cb)(void *ptr, long size) EV_THROW) EV_THROW;
+EV_API_DECL void ev_set_allocator (void *(*cb)(void *ptr, long size)) EV_THROW;
 
 /* set the callback function to call on a
  * retryable syscall error
  * (such as failed select, poll, epoll_wait)
  */
-EV_API_DECL void ev_set_syserr_cb (void (*cb)(const char *msg) EV_THROW) EV_THROW;
+EV_API_DECL void ev_set_syserr_cb (void (*cb)(const char *msg)) EV_THROW;
 
 #if EV_MULTIPLICITY
 
@@ -670,7 +670,7 @@ EV_API_DECL void *ev_userdata (EV_P) EV_THROW;
 typedef void (*ev_loop_callback)(EV_P);
 EV_API_DECL void ev_set_invoke_pending_cb (EV_P_ ev_loop_callback invoke_pending_cb) EV_THROW;
 /* C++ doesn't allow the use of the ev_loop_callback typedef here, so we need to spell it out */
-EV_API_DECL void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P) EV_THROW, void (*acquire)(EV_P) EV_THROW) EV_THROW;
+EV_API_DECL void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P)) EV_THROW;
 
 EV_API_DECL unsigned int ev_pending_count (EV_P) EV_THROW; /* number of pending events, if any */
 EV_API_DECL void ev_invoke_pending (EV_P); /* invoke all pending watchers */

data/src/nginx_module/CacheLocationConfig.c

@@ -48,39 +48,6 @@ generated_cache_location_part(ngx_conf_t *cf, passenger_loc_conf_t *conf) {
      * Calculate lengths
      */
 
-    if (conf->socket_backlog != NGX_CONF_UNSET) {
-        end = ngx_snprintf(int_buf,
-            sizeof(int_buf) - 1,
-            "%d",
-            conf->socket_backlog);
-        len += sizeof("!~PASSENGER_SOCKET_BACKLOG: ") - 1;
-        len += end - int_buf;
-        len += sizeof("\r\n") - 1;
-    }
-
-    if (conf->core_file_descriptor_ulimit != NGX_CONF_UNSET_UINT) {
-        end = ngx_snprintf(int_buf,
-            sizeof(int_buf) - 1,
-            "%ui",
-            conf->core_file_descriptor_ulimit);
-        len += sizeof("!~PASSENGER_CORE_FILE_DESCRIPTOR_ULIMIT: ") - 1;
-        len += end - int_buf;
-        len += sizeof("\r\n") - 1;
-    }
-
-    if (conf->disable_security_update_check != NGX_CONF_UNSET) {
-        len += sizeof("!~DISABLE_SECURITY_UPDATE_CHECK: ") - 1;
-        len += conf->disable_security_update_check
-            ? sizeof("t\r\n") - 1
-            : sizeof("f\r\n") - 1;
-    }
-
-    if (conf->security_update_check_proxy.data != NULL) {
-        len += sizeof("!~SECURITY_UPDATE_CHECK_PROXY: ") - 1;
-        len += conf->security_update_check_proxy.len;
-        len += sizeof("\r\n") - 1;
-    }
-
     if (conf->app_file_descriptor_ulimit != NGX_CONF_UNSET_UINT) {
         end = ngx_snprintf(int_buf,
             sizeof(int_buf) - 1,
@@ -316,48 +283,6 @@ generated_cache_location_part(ngx_conf_t *cf, passenger_loc_conf_t *conf) {
         return 0;
     }
 
-    if (conf->socket_backlog != NGX_CONF_UNSET) {
-        pos = ngx_copy(pos,
-            "!~PASSENGER_SOCKET_BACKLOG: ",
-            sizeof("!~PASSENGER_SOCKET_BACKLOG: ") - 1);
-        end = ngx_snprintf(int_buf,
-            sizeof(int_buf) - 1,
-            "%d",
-            conf->socket_backlog);
-        pos = ngx_copy(pos, int_buf, end - int_buf);
-        pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
-    }
-    if (conf->core_file_descriptor_ulimit != NGX_CONF_UNSET_UINT) {
-        pos = ngx_copy(pos,
-            "!~PASSENGER_CORE_FILE_DESCRIPTOR_ULIMIT: ",
-            sizeof("!~PASSENGER_CORE_FILE_DESCRIPTOR_ULIMIT: ") - 1);
-        end = ngx_snprintf(int_buf,
-            sizeof(int_buf) - 1,
-            "%ui",
-            conf->core_file_descriptor_ulimit);
-        pos = ngx_copy(pos, int_buf, end - int_buf);
-        pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
-    }
-    if (conf->disable_security_update_check != NGX_CONF_UNSET) {
-        pos = ngx_copy(pos,
-            "!~DISABLE_SECURITY_UPDATE_CHECK: ",
-            sizeof("!~DISABLE_SECURITY_UPDATE_CHECK: ") - 1);
-        if (conf->disable_security_update_check) {
-            pos = ngx_copy(pos, "t\r\n", sizeof("t\r\n") - 1);
-        } else {
-            pos = ngx_copy(pos, "f\r\n", sizeof("f\r\n") - 1);
-        }
-    }
-
-    if (conf->security_update_check_proxy.data != NULL) {
-        pos = ngx_copy(pos,
-            "!~SECURITY_UPDATE_CHECK_PROXY: ",
-            sizeof("!~SECURITY_UPDATE_CHECK_PROXY: ") - 1);
-        pos = ngx_copy(pos,
-            conf->security_update_check_proxy.data,
-            conf->security_update_check_proxy.len);
-        pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
-    }
     if (conf->app_file_descriptor_ulimit != NGX_CONF_UNSET_UINT) {
         pos = ngx_copy(pos,
             "!~PASSENGER_APP_FILE_DESCRIPTOR_ULIMIT: ",

data/src/nginx_module/CacheLocationConfig.c.cxxcodebuilder

@@ -195,6 +195,7 @@ def filter_eligible_options(options)
     option[:alias_for] ||
       option.fetch(:field, true).nil? ||
       option[:field].to_s =~ /\./ ||
+      option[:struct] == 'NGX_HTTP_MAIN_CONF_OFFSET' ||
       !option.fetch(:header, true)
   end
 end

data/src/nginx_module/Configuration.c

@@ -1652,4 +1652,3 @@ const ngx_command_t passenger_commands[] = {
 
     ngx_null_command
 };
-

data/src/nginx_module/Configuration.h

@@ -76,4 +76,3 @@ char *passenger_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child);
 ngx_int_t passenger_postprocess_config(ngx_conf_t *cf);
 
 #endif /* _PASSENGER_NGINX_CONFIGURATION_H_ */
-

data/src/nginx_module/ConfigurationCommands.c

@@ -79,7 +79,7 @@
 },
 {
     ngx_string("passenger_enabled"),
-    NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_FLAG,
+    NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_FLAG,
     passenger_enabled,
     NGX_HTTP_LOC_CONF_OFFSET,
     offsetof(passenger_loc_conf_t, enabled),

data/src/nginx_module/ContentHandler.c

@@ -1492,4 +1492,3 @@ passenger_content_handler(ngx_http_request_t *r)
 
     return NGX_DONE;
 }
-

data/src/nginx_module/ContentHandler.h

@@ -55,4 +55,3 @@ ngx_int_t passenger_content_handler(ngx_http_request_t *r);
 
 
 #endif /* _PASSENGER_NGINX_CONTENT_HANDLER_H_ */
-

data/src/nginx_module/CreateLocationConfig.c

@@ -39,11 +39,6 @@
 
 void
 generated_set_conf_part(passenger_loc_conf_t  *conf) {
-    conf->socket_backlog = NGX_CONF_UNSET;
-    conf->core_file_descriptor_ulimit = NGX_CONF_UNSET_UINT;
-    conf->disable_security_update_check = NGX_CONF_UNSET;
-    conf->security_update_check_proxy.data = NULL;
-    conf->security_update_check_proxy.len  = 0;
     conf->app_file_descriptor_ulimit = NGX_CONF_UNSET_UINT;
     conf->enabled = NGX_CONF_UNSET;
     conf->ruby.data = NULL;

data/src/nginx_module/CreateLocationConfig.c.cxxcodebuilder

@@ -83,6 +83,7 @@ def filter_eligible_options(options)
     option[:alias_for] ||
       option.fetch(:field, true).nil? ||
       option[:field].to_s =~ /\./ ||
+      option[:struct] == 'NGX_HTTP_MAIN_CONF_OFFSET' ||
       option[:auto_generate_nginx_create_code] == false
   end
 end

data/src/nginx_module/LocationConfig.h

@@ -51,9 +51,7 @@ typedef struct {
     ngx_int_t abort_websockets_on_process_shutdown;
     ngx_uint_t app_file_descriptor_ulimit;
     ngx_array_t *base_uris;
-    ngx_uint_t core_file_descriptor_ulimit;
     ngx_int_t debugger;
-    ngx_int_t disable_security_update_check;
     ngx_int_t enabled;
     ngx_array_t *env_vars;
     ngx_int_t force_max_concurrent_requests_per_process;
@@ -68,7 +66,6 @@ typedef struct {
     ngx_int_t max_requests;
     ngx_int_t min_instances;
     ngx_int_t request_queue_overflow_status_code;
-    ngx_int_t socket_backlog;
     ngx_int_t start_timeout;
     ngx_int_t sticky_sessions;
     ngx_array_t *union_station_filters;
@@ -85,7 +82,6 @@ typedef struct {
     ngx_str_t python;
     ngx_str_t restart_dir;
     ngx_str_t ruby;
-    ngx_str_t security_update_check_proxy;
     ngx_str_t spawn_method;
     ngx_str_t startup_file;
     ngx_str_t sticky_sessions_cookie_name;

data/src/nginx_module/LocationConfig.h.cxxcodebuilder

@@ -81,7 +81,8 @@ def filter_eligible_options(options)
   options.reject do |option|
     option[:alias_for] ||
       option.fetch(:field, true).nil? ||
-      option[:field].to_s =~ /\./
+      option[:field].to_s =~ /\./ ||
+      option[:struct] == 'NGX_HTTP_MAIN_CONF_OFFSET'
   end
 end
 

data/src/nginx_module/MergeLocationConfig.c

@@ -42,18 +42,6 @@
  */
 int
 generated_merge_part(passenger_loc_conf_t *conf, passenger_loc_conf_t *prev, ngx_conf_t *cf) {
-    ngx_conf_merge_value(conf->socket_backlog,
-        prev->socket_backlog,
-        NGX_CONF_UNSET);
-    ngx_conf_merge_uint_value(conf->core_file_descriptor_ulimit,
-        prev->core_file_descriptor_ulimit,
-        NGX_CONF_UNSET_UINT);
-    ngx_conf_merge_value(conf->disable_security_update_check,
-        prev->disable_security_update_check,
-        NGX_CONF_UNSET);
-    ngx_conf_merge_str_value(conf->security_update_check_proxy,
-        prev->security_update_check_proxy,
-        NULL);
     ngx_conf_merge_uint_value(conf->app_file_descriptor_ulimit,
         prev->app_file_descriptor_ulimit,
         NGX_CONF_UNSET_UINT);

data/src/nginx_module/MergeLocationConfig.c.cxxcodebuilder

@@ -104,6 +104,7 @@ def filter_eligible_options(options)
     option[:alias_for] ||
       option.fetch(:field, true).nil? ||
       option[:field].to_s =~ /\./ ||
+      option[:struct] == 'NGX_HTTP_MAIN_CONF_OFFSET' ||
       !option.fetch(:auto_generate_nginx_merge_code, true)
   end
 end

data/src/nginx_module/ngx_http_passenger_module.h

@@ -62,4 +62,3 @@ extern PsgWatchdogLauncher      *psg_watchdog_launcher;
 extern ngx_cycle_t              *pp_current_cycle;
 
 #endif /* _PASSENGER_NGINX_MODULE_H_ */
-

data/src/ruby_supportlib/phusion_passenger.rb

@@ -31,7 +31,7 @@ module PhusionPassenger
 
   PACKAGE_NAME = 'passenger'
   # Run 'rake src/cxx_supportlib/Constants.h' after changing this number.
-  VERSION_STRING = '5.1.10'
+  VERSION_STRING = '5.1.11'
 
   PREFERRED_NGINX_VERSION = '1.12.1'
   NGINX_SHA256_CHECKSUM = '8793bf426485a30f91021b6b945a9fd8a84d87d17b566562c3797aba8fac76fb'

data/src/ruby_supportlib/phusion_passenger/common_library.rb

@@ -149,18 +149,18 @@ private
       optimize.sub!(/-flto/, "")
     end
 
-    extra_compiler_flags = "#{extra_compiler_flags} #{options[:cflags]}".strip
-
     define_c_or_cxx_object_compilation_task(
       object_file,
       source_file,
-      :include_paths => CXX_SUPPORTLIB_INCLUDE_PATHS,
-      :flags => [
-        LIBEV_CFLAGS,
-        LIBUV_CFLAGS,
-        optimize,
-        extra_compiler_flags
-      ]
+      lambda { {
+        :include_paths => CXX_SUPPORTLIB_INCLUDE_PATHS,
+        :flags => [
+          libev_cflags,
+          libuv_cflags,
+          optimize,
+          "#{maybe_eval_lambda(extra_compiler_flags)} #{options[:cflags]}".strip
+        ]
+      } }
     )
   end
 
@@ -274,6 +274,12 @@ COMMON_LIBRARY = CommonLibraryBuilder.new do
   define_component 'Exceptions.o',
     :source   => 'Exceptions.cpp',
     :category => :base
+  define_component 'ProcessManagement/Spawn.o',
+    :source   => 'ProcessManagement/Spawn.cpp',
+    :category => :base
+  define_component 'ProcessManagement/Utils.o',
+    :source   => 'ProcessManagement/Utils.cpp',
+    :category => :base
   define_component 'Utils/SystemTime.o',
     :source   => 'Utils/SystemTime.cpp',
     :category => :base
@@ -341,16 +347,19 @@ COMMON_LIBRARY = CommonLibraryBuilder.new do
 
   define_component 'vendor-modified/modp_b64.o',
     :source   => 'vendor-modified/modp_b64.cpp',
-    :category => :bas64,
+    :category => :base64,
     :optimize => true,
     :strict_aliasing => false
   define_component 'vendor-modified/modp_b64_strict_aliasing.o',
     :source   => 'vendor-modified/modp_b64_strict_aliasing.cpp',
-    :category => :bas64,
+    :category => :base64,
     :optimize => true
   define_component 'UnionStationFilterSupport.o',
     :source   => 'UnionStationFilterSupport.cpp',
     :category => :union_station_filter
+  define_component 'ProcessManagement/Ruby.o',
+    :source   => 'ProcessManagement/Ruby.cpp',
+    :category => :process_management_ruby
 end
 
 # A subset of the objects are linked to the Nginx binary. This defines