From: Eric Wong <e@80x24.org>
Date: Tue, 3 May 2016 06:20:54 +0000 (+0000)
Subject: spawnpp: use native perl %ENV outside of mod_perl
X-Git-Tag: v1.0.0~559
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=2e4250880849e2f08cb58a8708952fcd8a4a6e54;p=public-inbox.git

spawnpp: use native perl %ENV outside of mod_perl

We only need to use env(1) under mod_perl; since mod_perl
is uncommon nowadays, support native %ENV for a teeny
speedup for folks uncomfortable with running vfork via
Inline::C snippet.
---

diff --git a/lib/PublicInbox/SpawnPP.pm b/lib/PublicInbox/SpawnPP.pm
index dc2ef364..fe95d126 100644
--- 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;
 }