urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'jcflack/early-env'

master
Simon McVittie 2014-09-15 09:44:51 +01:00
parent f574bc2ed4 29e80b4eed
commit 9d928bd694
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
IkiWiki/Wrapper.pm
View File

@ -52,6 +52,7 @@ sub gen_wrapper () {
HTTP_COOKIE REMOTE_USER HTTPS REDIRECT_STATUS HTTP_COOKIE REMOTE_USER HTTPS REDIRECT_STATUS
HTTP_HOST SERVER_PORT HTTPS HTTP_ACCEPT HTTP_HOST SERVER_PORT HTTPS HTTP_ACCEPT
REDIRECT_URL} if $config{cgi}; REDIRECT_URL} if $config{cgi};
my $envsize=$#envsave;
my $envsave=""; my $envsave="";
foreach my $var (@envsave) { foreach my $var (@envsave) {
$envsave.=<<"EOF"; $envsave.=<<"EOF";
@ -59,6 +60,18 @@ sub gen_wrapper () {
addenv("$var", s); addenv("$var", s);
EOF EOF
} }
if (ref $config{ENV} eq 'HASH') {
foreach my $key (keys %{$config{ENV}}) {
my $val=$config{ENV}{$key};
utf8::encode($val) if utf8::is_utf8($val);
$val =~ s/([^A-Za-z0-9])/sprintf '""\\x%02x""', ord($1)/ge;
$envsize += 1;
$envsave.=<<"EOF";
addenv("$key", "$val");
EOF
}
delete $config{ENV};
}
my @wrapper_hooks; my @wrapper_hooks;
run_hooks(genwrapper => sub { push @wrapper_hooks, shift->() }); run_hooks(genwrapper => sub { push @wrapper_hooks, shift->() });
@ -171,7 +184,7 @@ EOF
#include <sys/file.h> #include <sys/file.h>
extern char **environ; extern char **environ;
char *newenviron[$#envsave+7]; char *newenviron[$envsize+7];
int i=0; int i=0;
void addenv(char *var, char *val) { void addenv(char *var, char *val) {