do not blow up when RUBYOPT is not defined (#1385)

puma · Aug 16, 2017 · aa16777 · aa16777
1 parent e60bd54
commit aa16777
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/puma/launcher.rb b/lib/puma/launcher.rb
@@ -165,10 +165,10 @@ def phased_restart
     def run
       previous_env =
         if defined?(Bundler)
-          env = Bundler::ORIGINAL_ENV
+          env = Bundler::ORIGINAL_ENV.dup
           # add -rbundler/setup so we load from Gemfile when restarting
           bundle = "-rbundler/setup"
-          env["RUBYOPT"] = [env["RUBYOPT"], bundle].join(" ") unless env["RUBYOPT"].include?(bundle)
+          env["RUBYOPT"] = [env["RUBYOPT"], bundle].join(" ") unless env["RUBYOPT"].to_s.include?(bundle)
           env
         else
           ENV.to_h