passenger 6.0.2 → 6.0.7

data/src/nginx_module/MainConfig/AutoGeneratedManifestGeneration.c

@@ -239,6 +239,18 @@ generate_config_manifest_for_autogenerated_main_conf(manifest_gen_ctx_t *ctx, pa
             (const char *) conf->autogenerated.instance_registry_dir.data,
             conf->autogenerated.instance_registry_dir.len);
     }
+    if (conf->autogenerated.spawn_dir_explicitly_set) {
+        option_container = find_or_create_manifest_option_container(ctx,
+            ctx->global_config_container,
+            "passenger_spawn_dir",
+            sizeof("passenger_spawn_dir") - 1);
+        hierarchy_member = add_manifest_option_container_hierarchy_member(option_container,
+            &conf->autogenerated.spawn_dir_source_file,
+            conf->autogenerated.spawn_dir_source_line);
+        psg_json_value_set_str(hierarchy_member, "value",
+            (const char *) conf->autogenerated.spawn_dir.data,
+            conf->autogenerated.spawn_dir.len);
+    }
     if (conf->autogenerated.turbocaching_explicitly_set) {
         option_container = find_or_create_manifest_option_container(ctx,
             ctx->global_config_container,

data/src/nginx_module/MainConfig/AutoGeneratedStruct.h

@@ -71,6 +71,7 @@ typedef struct {
     ngx_str_t log_file;
     ngx_str_t root_dir;
     ngx_str_t security_update_check_proxy;
+    ngx_str_t spawn_dir;
 
     ngx_str_t abort_on_startup_error_source_file;
     ngx_str_t admin_panel_auth_type_source_file;
@@ -101,6 +102,7 @@ typedef struct {
     ngx_str_t security_update_check_proxy_source_file;
     ngx_str_t show_version_in_header_source_file;
     ngx_str_t socket_backlog_source_file;
+    ngx_str_t spawn_dir_source_file;
     ngx_str_t stat_throttle_rate_source_file;
     ngx_str_t turbocaching_source_file;
     ngx_str_t user_switching_source_file;
@@ -134,6 +136,7 @@ typedef struct {
     ngx_uint_t security_update_check_proxy_source_line;
     ngx_uint_t show_version_in_header_source_line;
     ngx_uint_t socket_backlog_source_line;
+    ngx_uint_t spawn_dir_source_line;
     ngx_uint_t stat_throttle_rate_source_line;
     ngx_uint_t turbocaching_source_line;
     ngx_uint_t user_switching_source_line;
@@ -167,6 +170,7 @@ typedef struct {
     ngx_int_t security_update_check_proxy_explicitly_set;
     ngx_int_t show_version_in_header_explicitly_set;
     ngx_int_t socket_backlog_explicitly_set;
+    ngx_int_t spawn_dir_explicitly_set;
     ngx_int_t stat_throttle_rate_explicitly_set;
     ngx_int_t turbocaching_explicitly_set;
     ngx_int_t user_switching_explicitly_set;

data/src/nginx_module/ngx_http_passenger_module.c

@@ -43,9 +43,9 @@
 
 #define MODP_B64_DONT_INCLUDE_BOOST_ENDIANNESS_HEADERS
 #if NGX_HAVE_LITTLE_ENDIAN
-    #define BOOST_LITTLE_ENDIAN
+    #define BOOST_ENDIAN_LITTLE_BYTE
 #else
-    #define BOOST_BIG_ENDIAN
+    #define BOOST_ENDIAN_BIG_BYTE
 #endif
 
 #include "ngx_http_passenger_module.h"
@@ -367,6 +367,7 @@ start_watchdog(ngx_cycle_t *cycle) {
     psg_json_value_set_ngx_uint  (w_config, "controller_socket_backlog", autogenerated_main_conf->socket_backlog);
     psg_json_value_set_ngx_str_ne(w_config, "controller_file_buffered_channel_buffer_dir", &autogenerated_main_conf->data_buffer_dir);
     psg_json_value_set_ngx_str_ne(w_config, "instance_registry_dir", &autogenerated_main_conf->instance_registry_dir);
+    psg_json_value_set_ngx_str_ne(w_config, "spawn_dir", &autogenerated_main_conf->spawn_dir);
     psg_json_value_set_ngx_flag  (w_config, "security_update_checker_disabled", autogenerated_main_conf->disable_security_update_check);
     psg_json_value_set_ngx_str_ne(w_config, "security_update_checker_proxy_url", &autogenerated_main_conf->security_update_check_proxy);
     psg_json_value_set_ngx_flag  (w_config, "telemetry_collector_disabled", autogenerated_main_conf->disable_anonymous_telemetry);

data/src/ruby_supportlib/phusion_passenger.rb

@@ -31,20 +31,20 @@ module PhusionPassenger
 
   PACKAGE_NAME = 'passenger'
   # Run 'rake src/cxx_supportlib/Constants.h configkit_schemas_inline_comments' after changing this number.
-  VERSION_STRING = '6.0.2'
+  VERSION_STRING = '6.0.7'
 
   # Tip: find the SHA-256 with ./dev/nginx_version_sha2 <VERSION>
-  PREFERRED_NGINX_VERSION = '1.15.8'
-  NGINX_SHA256_CHECKSUM = 'a8bdafbca87eb99813ae4fcac1ad0875bf725ce19eb265d28268c309b2b40787'
+  PREFERRED_NGINX_VERSION = '1.18.0'
+  NGINX_SHA256_CHECKSUM = '4c373e7ab5bf91d34a4f11a0c9496561061ba5eee6020db272a17a7228d35f99'
 
   # Packaging may be locked to an older version due to the specific module configuration being
   # incompatible with the version we prefer (latest stable).
-  PACKAGING_PREFERRED_NGINX_VERSION = '1.15.8'
-  PACKAGING_NGINX_SHA256_CHECKSUM = 'a8bdafbca87eb99813ae4fcac1ad0875bf725ce19eb265d28268c309b2b40787'
+  PACKAGING_PREFERRED_NGINX_VERSION = '1.18.0'
+  PACKAGING_NGINX_SHA256_CHECKSUM = '4c373e7ab5bf91d34a4f11a0c9496561061ba5eee6020db272a17a7228d35f99'
 
   # sha256sum of the .tar.gz
-  PREFERRED_PCRE_VERSION  = '8.42'
-  PCRE_SHA256_CHECKSUM = '69acbc2fbdefb955d42a4c606dfde800c2885711d2979e356c0636efde9ec3b5'
+  PREFERRED_PCRE_VERSION  = '8.44'
+  PCRE_SHA256_CHECKSUM = 'aecafd4af3bd0f3935721af77b889d9024b2e01d96b58471bd91a3063fb47728'
 
   STANDALONE_INTERFACE_VERSION  = 1
 
@@ -258,7 +258,7 @@ module PhusionPassenger
   end
 
 
-private
+  private
   def self.infer_install_spec
     filename = ENV['PASSENGER_LOCATION_CONFIGURATION_FILE']
     return filename if filename && !filename.empty?

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

@@ -294,7 +294,7 @@ module PhusionPassenger
         else
           return total
         end
-      rescue Errno::EACCES, Errno::ENOENT
+      rescue Errno::EACCES, Errno::ENOENT, Errno::ESRCH
         return nil
       end
 

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

@@ -222,6 +222,13 @@ APACHE2_CONFIGURATION_OPTIONS = [
     :dynamic_default => 'Either /var/run/passenger-instreg, $TMPDIR, or /tmp (see docs)',
     :desc      => "The directory to register the #{PROGRAM_NAME} instance to."
   },
+  {
+    :name      => 'PassengerSpawnDir',
+    :type      => :string,
+    :context   => :global,
+    :dynamic_default => 'Either $TMPDIR or /tmp',
+    :desc      => "The directory for #{PROGRAM_NAME} used during child spawning."
+  },
   {
     :name      => 'PassengerDisableSecurityUpdateCheck',
     :type      => :flag,
@@ -437,6 +444,12 @@ APACHE2_CONFIGURATION_OPTIONS = [
     :desc      => 'The spawn method to use.',
     :function  => 'cmd_passenger_spawn_method'
   },
+  {
+    :name      => 'PassengerDirectInstanceRequestAddress',
+    :type      => :string,
+    :default   => DEFAULT_BIND_ADDRESS,
+    :desc      => 'The address that Passenger binds to in order to allow sending HTTP requests to individual application processes.'
+  },
   {
     :name      => 'PassengerFriendlyErrorPages',
     :type      => :flag,
@@ -540,6 +553,15 @@ APACHE2_CONFIGURATION_OPTIONS = [
     :default_expr => 'DEFAULT_STICKY_SESSIONS_COOKIE_NAME',
     :desc      => 'The cookie name to use for sticky sessions.'
   },
+  {
+    :name      => 'PassengerStickySessionsCookieAttributes',
+    :type      => :string,
+    :context   => :location,
+    :htaccess_context => ['OR_ALL'],
+    :default   => DEFAULT_STICKY_SESSIONS_COOKIE_ATTRIBUTES,
+    :default_expr => 'DEFAULT_STICKY_SESSIONS_COOKIE_ATTRIBUTES',
+    :desc      => 'The attributes to use for the sticky session cookie.'
+  },
   {
     :name      => 'PassengerBufferResponse',
     :type      => :flag,

data/src/ruby_supportlib/phusion_passenger/constants.rb

@@ -58,10 +58,12 @@ module PhusionPassenger
     DEFAULT_WEB_APP_USER = "nobody"
     DEFAULT_APP_ENV = "production"
     DEFAULT_SPAWN_METHOD = "smart"
+    DEFAULT_BIND_ADDRESS = "127.0.0.1"
     # Apache's unixd.h also defines DEFAULT_USER, so we avoid naming clash here.
     PASSENGER_DEFAULT_USER = "nobody"
     DEFAULT_CONCURRENCY_MODEL = "process"
     DEFAULT_STICKY_SESSIONS_COOKIE_NAME = "_passenger_route"
+    DEFAULT_STICKY_SESSIONS_COOKIE_ATTRIBUTES = "SameSite=Lax; Secure;"
     DEFAULT_APP_THREAD_COUNT = 1
     DEFAULT_RESPONSE_BUFFER_HIGH_WATERMARK = 1024 * 1024 * 128
     DEFAULT_MAX_REQUEST_QUEUE_SIZE = 100
@@ -115,7 +117,7 @@ module PhusionPassenger
     PROGRAM_WEBSITE     = "https://www.phusionpassenger.com"
     PROGRAM_AUTHOR      = "Phusion"
     SUPPORT_URL         = "https://www.phusionpassenger.com/support"
-    ENTERPRISE_URL      = "https://www.phusionpassenger.com/enterprise"
+    ENTERPRISE_URL      = "https://www.phusionpassenger.com/features#premium-features"
     GLOBAL_NAMESPACE_DIRNAME            = PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME_
     # Subdirectory under $HOME to use for storing stuff.
     USER_NAMESPACE_DIRNAME              = PhusionPassenger::USER_NAMESPACE_DIRNAME_

data/src/ruby_supportlib/phusion_passenger/loader_shared_helpers.rb

@@ -316,9 +316,11 @@ module PhusionPassenger
           ActiveRecord::Base.clear_all_connections!
         elsif ActiveRecord::Base.respond_to?(:clear_active_connections!)
           ActiveRecord::Base.clear_active_connections!
-        elsif ActiveRecord::Base.respond_to?(:connected?) &&
-              ActiveRecord::Base.connected?
+        end
+        begin
           ActiveRecord::Base.establish_connection
+        rescue
+          DebugLogging.debug('ActiveRecord is not configured, start it yourself')
         end
       end
 

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

@@ -239,6 +239,14 @@ NGINX_CONFIGURATION_OPTIONS = [
     :context  => [:main],
     :struct   => 'NGX_HTTP_MAIN_CONF_OFFSET'
   },
+  {
+    :name     => 'passenger_spawn_dir',
+    :scope    => :global,
+    :type     => :string,
+    :dynamic_default => 'Either $TMPDIR or /tmp',
+    :context  => [:main],
+    :struct   => 'NGX_HTTP_MAIN_CONF_OFFSET'
+  },
   {
     :name     => 'passenger_turbocaching',
     :scope    => :global,
@@ -468,6 +476,12 @@ NGINX_CONFIGURATION_OPTIONS = [
     :dynamic_default => "'smart' for Ruby apps, 'direct' for all other apps",
     :type     => :string
   },
+  {
+    :name     => 'passenger_direct_instance_request_address',
+    :scope    => :application,
+    :default  => DEFAULT_BIND_ADDRESS,
+    :type     => :string
+  },
   {
     :name     => 'passenger_load_shell_envvars',
     :scope    => :application,
@@ -548,6 +562,14 @@ NGINX_CONFIGURATION_OPTIONS = [
     :type     => :string,
     :header   => nil
   },
+  {
+    :name     => 'passenger_temp_path',
+    :scope    => :location,
+    :type     => :string,
+    :function => 'ngx_conf_set_path_slot',
+    :field    => 'upstream_config.temp_path',
+    :auto_generate_nginx_tracking_code => false
+  },
   {
     :name     => 'passenger_ignore_headers',
     :scope    => :location,
@@ -654,6 +676,13 @@ NGINX_CONFIGURATION_OPTIONS = [
     :type     => :integer,
     :default  => 503
   },
+  {
+    :name     => 'passenger_buffer_upload',
+    :type     => :flag,
+    :scope    => :location,
+    :default  => false,
+    :header   => nil
+  },
   {
     :name     => 'passenger_sticky_sessions',
     :scope    => :location,
@@ -666,6 +695,12 @@ NGINX_CONFIGURATION_OPTIONS = [
     :type     => :string,
     :default  => DEFAULT_STICKY_SESSIONS_COOKIE_NAME
   },
+  {
+    :name     => 'passenger_sticky_sessions_cookie_attributes',
+    :scope    => :location,
+    :type     => :string,
+    :default  => DEFAULT_STICKY_SESSIONS_COOKIE_ATTRIBUTES
+  },
   {
     :name     => 'passenger_vary_turbocache_by_cookie',
     :scope    => :location,

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

@@ -890,7 +890,7 @@ module PhusionPassenger
             # On macOS >= 10.13 High Sierra /usr/include no longer
             # exists.
             xcode_prefix = `/usr/bin/xcode-select -p`.strip
-            ["-I#{xcode_prefix}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/apr-1" \
+            ["-I#{xcode_prefix}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/apr-1 " \
              "-I#{xcode_prefix}/SDKs/MacOSX.sdk/usr/include/apr-1",
              '-laprutil-1']
           else

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

@@ -279,7 +279,7 @@ module PhusionPassenger
           "-c '#{filename}' -o '#{filename}.o'",
           flags)
         result = run_compiler(description, command, filename, source, true)
-        result = result && result[:result] && result[:output] !~ /unknown warning option/i
+        result = result && result[:result] && result[:output] !~ /unknown warning option|unrecognized command line option/i
       end
       return false if !result
 

data/src/ruby_supportlib/phusion_passenger/rack/thread_handler_extension.rb

@@ -25,6 +25,16 @@
 
 PhusionPassenger.require_passenger_lib 'utils/tee_input'
 
+if defined?(::Rack::BodyProxy) && !::Rack::BodyProxy.new("").respond_to?(:each)
+  module ::Rack
+    class BodyProxy
+      def each
+        @body.each { |body| yield body }
+      end
+    end
+  end
+end
+
 module PhusionPassenger
   module Rack
 

data/src/ruby_supportlib/phusion_passenger/request_handler.rb

@@ -99,7 +99,7 @@ module PhusionPassenger
       if should_use_unix_sockets?
         @main_socket_address, @main_socket = create_unix_socket_on_filesystem(options)
       else
-        @main_socket_address, @main_socket = create_tcp_socket
+        @main_socket_address, @main_socket = create_tcp_socket(options)
       end
       @server_sockets[:main] = {
         :address     => @main_socket_address,
@@ -109,7 +109,7 @@ module PhusionPassenger
         :accept_http_requests => true
       }
 
-      @http_socket_address, @http_socket = create_tcp_socket
+      @http_socket_address, @http_socket = create_tcp_socket(options)
       @server_sockets[:http] = {
         :address     => @http_socket_address,
         :socket      => @http_socket,
@@ -309,16 +309,17 @@ module PhusionPassenger
       end
     end
 
-    def create_tcp_socket
-      # We use "127.0.0.1" as address in order to force
+    def create_tcp_socket(options)
+      # We default to "127.0.0.1" as address in order to force
       # TCPv4 instead of TCPv6.
-      socket = TCPServer.new('127.0.0.1', 0)
+      bind_address = options.fetch('bind_address', '127.0.0.1')
+      socket = TCPServer.new(bind_address, 0)
       socket.listen(BACKLOG_SIZE)
       socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
       socket.binmode
       socket.sync = true
       socket.close_on_exec!
-      socket_address = "tcp://127.0.0.1:#{socket.addr[1]}"
+      socket_address = "tcp://#{bind_address}:#{socket.addr[1]}"
       return [socket_address, socket]
     end
 

data/src/ruby_supportlib/phusion_passenger/request_handler/thread_handler.rb

@@ -267,6 +267,11 @@ module PhusionPassenger
             headers["SERVER_NAME"]     = "127.0.0.1"
             headers["SERVER_PORT"]     = connection.addr[1].to_s
             headers["SERVER_PROTOCOL"] = protocol
+            headers["REMOTE_PORT"],
+            headers["REMOTE_ADDR"]     = connection.to_io.is_a?(TCPSocket) ?
+                                           connection.to_io.peeraddr(:numeric)[1..2] :
+                                           [nil, '127.0.0.1']
+
           else
             header, value = line.split(/\s*:\s*/, 2)
             header.upcase!            # "Foo-Bar" => "FOO-BAR"

data/src/ruby_supportlib/phusion_passenger/standalone/config_options_list.rb

@@ -258,6 +258,13 @@ module PhusionPassenger
         :default   => PlatformInfo.ruby_supports_fork? ? DEFAULT_SPAWN_METHOD : 'direct',
         :desc      => 'The spawn method to use. Default: see docs'
       },
+      {
+        :name      => :direct_instance_request_address,
+        :type      => :hostname,
+        :type_desc => 'HOST',
+        :default   => '127.0.0.1',
+        :desc      => "The address that Passenger binds to in order to allow sending HTTP requests to individual application processes.\nDefault: %DEFAULT%"
+      },
       {
         :name      => :static_files_dir,
         :type      => :path,
@@ -436,6 +443,12 @@ module PhusionPassenger
         :desc      => "Cookie name to use for sticky sessions.\n" \
                       "Default: #{DEFAULT_STICKY_SESSIONS_COOKIE_NAME}"
       },
+      {
+        :name      => :sticky_sessions_cookie_attributes,
+        :type_desc => "'NAME1=VALUE1; NAME2'",
+        :desc      => "The attributes to use for the sticky session cookie.\n" \
+                      "Default: #{DEFAULT_STICKY_SESSIONS_COOKIE_ATTRIBUTES}"
+      },
       {
         :name      => :vary_turbocache_by_cookie,
         :type_desc => 'NAME',

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

@@ -109,6 +109,7 @@ module PhusionPassenger
           add_param(command, :log_file, "--log-file")
           add_param(command, :pid_file, "--pid-file")
           add_param(command, :instance_registry_dir, "--instance-registry-dir")
+          add_param(command, :spawn_dir, "--spawn-dir")
           add_param(command, :data_buffer_dir, "--data-buffer-dir")
           add_param(command, :log_level, "--log-level")
           add_flag_param(command, :disable_log_prefix, "--disable-log-prefix")
@@ -174,6 +175,7 @@ module PhusionPassenger
           add_flag_param(command, :sticky_sessions, "--sticky-sessions")
           add_param(command, :vary_turbocache_by_cookie, "--vary-turbocache-by-cookie")
           add_param(command, :sticky_sessions_cookie_name, "--sticky-sessions-cookie-name")
+          add_param(command, :sticky_sessions_cookie_attributes, "--sticky-sessions-cookie-attributes")
           add_param(command, :ruby, "--ruby")
           add_param(command, :python, "--python")
           add_param(command, :nodejs, "--nodejs")
@@ -229,7 +231,7 @@ module PhusionPassenger
             abort "The '#{option_name}' feature is only available in #{PROGRAM_NAME} " +
               "Enterprise. You are currently running the open source #{PROGRAM_NAME}. " +
               "Please learn more about and/or buy #{PROGRAM_NAME} Enterprise at " +
-              "https://www.phusionpassenger.com/enterprise"
+              "https://www.phusionpassenger.com/features#premium-features"
           end
         end
 
@@ -238,7 +240,7 @@ module PhusionPassenger
             abort "The '#{option_name}' feature is only available in #{PROGRAM_NAME} " +
               "Enterprise. You are currently running the open source #{PROGRAM_NAME}. " +
               "Please learn more about and/or buy #{PROGRAM_NAME} Enterprise at " +
-              "https://www.phusionpassenger.com/enterprise"
+              "https://www.phusionpassenger.com/features#premium-features"
           end
         end
 

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

@@ -286,7 +286,7 @@ module PhusionPassenger
           if fix_existing_indenting
             # Remove extraneous indenting by 'if' blocks
             # and collapse multiple empty newlines
-            result.gsub!(/;[\n ]+/, ";\n")
+            result.gsub!(/;[\n ]+$/, ";\n")
           end
 
           # Set indenting

data/src/ruby_supportlib/phusion_passenger/utils/unseekable_socket.rb

@@ -24,6 +24,10 @@
 
 PhusionPassenger.require_passenger_lib 'utils'   # So that we can know whether #writev is supported.
 
+# https://www.ruby-lang.org/en/news/2019/12/12/separation-of-positional-and-keyword-arguments-in-ruby-3-0/
+def ruby2_keywords(*)
+end if RUBY_VERSION < "2.7"
+
 module PhusionPassenger
   module Utils
 
@@ -117,7 +121,7 @@ module PhusionPassenger
         raise annotate(e)
       end
 
-      def write_nonblock(string, *args)
+      ruby2_keywords def write_nonblock(string, *args)
         @socket.write_nonblock(string, *args)
       rescue => e
         raise annotate(e)
@@ -141,25 +145,25 @@ module PhusionPassenger
         raise annotate(e)
       end if IO.method_defined?(:writev3)
 
-      def send(*args)
+      ruby2_keywords def send(*args)
         @socket.send(*args)
       rescue => e
         raise annotate(e)
       end
 
-      def sendmsg(*args)
+      ruby2_keywords def sendmsg(*args)
         @socket.sendmsg(*args)
       rescue => e
         raise annotate(e)
       end
 
-      def sendmsg_nonblock(*args)
+      ruby2_keywords def sendmsg_nonblock(*args)
         @socket.sendmsg_nonblock(*args)
       rescue => e
         raise annotate(e)
       end
 
-      def puts(*args)
+      ruby2_keywords def puts(*args)
         @socket.puts(*args)
       rescue => e
         raise annotate(e)
@@ -172,7 +176,7 @@ module PhusionPassenger
         raise annotate(e)
       end
 
-      def read(*args)
+      ruby2_keywords def read(*args)
         if @simulate_eof
           length, buffer = args
           if buffer
@@ -191,14 +195,14 @@ module PhusionPassenger
         raise annotate(e)
       end
 
-      def read_nonblock(*args)
+      ruby2_keywords def read_nonblock(*args)
         raise EOFError, "end of file reached" if @simulate_eof
         @socket.read_nonblock(*args)
       rescue => e
         raise annotate(e)
       end
 
-      def readpartial(*args)
+      ruby2_keywords def readpartial(*args)
         raise EOFError, "end of file reached" if @simulate_eof
         @socket.readpartial(*args)
       rescue => e
@@ -212,21 +216,21 @@ module PhusionPassenger
         raise annotate(e)
       end
 
-      def recv(*args)
+      ruby2_keywords def recv(*args)
         raise EOFError, "end of file reached" if @simulate_eof
         @socket.recv(*args)
       rescue => e
         raise annotate(e)
       end
 
-      def recvfrom(*args)
+      ruby2_keywords def recvfrom(*args)
         raise EOFError, "end of file reached" if @simulate_eof
         @socket.recvfrom(*args)
       rescue => e
         raise annotate(e)
       end
 
-      def recvfrom_nonblock(*args)
+      ruby2_keywords def recvfrom_nonblock(*args)
         raise EOFError, "end of file reached" if @simulate_eof
         @socket.recvfrom_nonblock(*args)
       rescue => e