X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/9a99c4c6e2228954b27e1e93e2b66c12a74850ac..bc4721da0441a30822225c51b250be4cc5f8af24:/IkiWiki/Wrapper.pm

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index b46bc6aa9..ffbaf9908 100644
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -52,6 +52,7 @@ sub gen_wrapper () {
 		       HTTP_COOKIE REMOTE_USER HTTPS REDIRECT_STATUS
 		       HTTP_HOST SERVER_PORT HTTPS HTTP_ACCEPT
 		       REDIRECT_URL} if $config{cgi};
+	my $envsize=$#envsave;
 	my $envsave="";
 	foreach my $var (@envsave) {
 		$envsave.=<<"EOF";
@@ -59,6 +60,17 @@ sub gen_wrapper () {
 		addenv("$var", s);
 EOF
 	}
+	if (ref $config{ENV} eq 'HASH') {
+		foreach my $key (keys %{$config{ENV}}) {
+			my $val=$config{ENV}{$key};
+			$val =~ s/([\\"])/\\$1/g;
+			$envsize += 1;
+			$envsave.=<<"EOF";
+	addenv("$key", "$val");
+EOF
+		}
+		delete $config{ENV};
+	}
 	
 	my @wrapper_hooks;
 	run_hooks(genwrapper => sub { push @wrapper_hooks, shift->() });
@@ -171,7 +183,7 @@ EOF
 #include <sys/file.h>
 
 extern char **environ;
-char *newenviron[$#envsave+7];
+char *newenviron[$envsize+7];
 int i=0;
 
 void addenv(char *var, char *val) {