Skip to content

Commit 747f6a4

Browse files
committed
Fix Ruby 2.5 compatibility
1 parent 615d487 commit 747f6a4

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/ruby_supportlib/phusion_passenger/vendor/daemon_controller.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@ def abort_start(pid:, is_direct_child:)
459459
begin
460460
timeoutable(@start_abort_timeout) do
461461
allow_timeout do
462-
wait_for_aborted_process(pid:, is_direct_child:)
462+
wait_for_aborted_process(pid: pid, is_direct_child: is_direct_child)
463463
end
464464
end
465465
rescue Timeout::Error
@@ -469,7 +469,7 @@ def abort_start(pid:, is_direct_child:)
469469
end
470470

471471
allow_timeout do
472-
wait_for_aborted_process(pid:, is_direct_child:)
472+
wait_for_aborted_process(pid: pid, is_direct_child: is_direct_child)
473473
end
474474
end
475475
end

src/ruby_supportlib/phusion_passenger/vendor/daemon_controller/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ module PhusionPassenger
2525
class DaemonController
2626
MAJOR = 3
2727
MINOR = 0
28-
TINY = 1
28+
TINY = 2
2929
VERSION_STRING = "#{MAJOR}.#{MINOR}.#{TINY}"
3030
end # class DaemonController
3131
end # module PhusionPassenger

0 commit comments

Comments
 (0)