spawnpp: use native perl %ENV outside of mod_perl

[public-inbox.git] / lib / PublicInbox / SpawnPP.pm

diff --git a/lib/PublicInbox/SpawnPP.pm b/lib/PublicInbox/SpawnPP.pm
index dc2ef364f5b638f4b03169389ec504ab803df0fe..fe95d1269c210efb35720fd4d24584ac3eac101c 100644 (file)
--- a/lib/PublicInbox/SpawnPP.pm
+++ b/lib/PublicInbox/SpawnPP.pm
@@ -19,8 +19,15 @@ sub public_inbox_fork_exec ($$$$$$) {
                if ($err != 2) {
                        dup2($err, 2) or die "dup2 failed for stderr: $!";
                }
-               exec qw(env -i), @$env, @$cmd;
-               die "exec env -i ... $cmd->[0] failed: $!\n";
+
+               if ($ENV{MOD_PERL}) {
+                       exec qw(env -i), @$env, @$cmd;
+                       die "exec env -i ... $cmd->[0] failed: $!\n";
+               } else {
+                       local %ENV = map { split(/=/, $_, 2) } @$env;
+                       exec @$cmd;
+                       die "exec $cmd->[0] failed: $!\n";
+               }
        }
        $pid;
 }