From: Anders Kaseorg Date: Fri, 31 Jan 2014 05:19:59 +0000 (-0500) Subject: Merge commit 'baaa848f6c06b0b3a59677d3551e130c65e5fde7' into sipb X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/8e072cf1b075389b0bcf9e94e3ce3cf97ef48d5c?hp=-c Merge commit 'baaa848f6c06b0b3a59677d3551e130c65e5fde7' into sipb Conflicts: templates/page.tmpl --- 8e072cf1b075389b0bcf9e94e3ce3cf97ef48d5c diff --combined IkiWiki/Wrapper.pm index fd6b9c00f,3f3e63ca6..2f0c95465 --- a/IkiWiki/Wrapper.pm +++ b/IkiWiki/Wrapper.pm @@@ -28,7 -28,7 +28,7 @@@ sub gen_wrapper () my @envsave; push @envsave, qw{REMOTE_ADDR QUERY_STRING REQUEST_METHOD REQUEST_URI CONTENT_TYPE CONTENT_LENGTH GATEWAY_INTERFACE - HTTP_COOKIE REMOTE_USER HTTPS REDIRECT_STATUS + HTTP_COOKIE REMOTE_USER HTTPS SSL_CLIENT_S_DN_CN REDIRECT_STATUS REDIRECT_URL} if $config{cgi}; my $envsave=""; foreach my $var (@envsave) { @@@ -101,6 -101,7 +101,7 @@@ EO #include #include + extern char **environ; char *newenviron[$#envsave+6]; int i=0; @@@ -121,12 -122,17 +122,17 @@@ $envsav newenviron[i++]="HOME=$ENV{HOME}"; newenviron[i++]="WRAPPED_OPTIONS=$configstring"; + #ifdef __TINYC__ if (clearenv() != 0) { perror("clearenv"); exit(1); } for (; i>0; i--) putenv(newenviron[i-1]); + #else + newenviron[i]=NULL; + environ=newenviron; + #endif if (setregid(getegid(), -1) != 0 && setregid(getegid(), -1) != 0) { @@@ -152,6 -158,7 +158,6 @@@ EO #translators: The parameter is a C filename. error(sprintf(gettext("failed to compile %s"), "$wrapper.c")); } - unlink("$wrapper.c"); if (defined $config{wrappergroup}) { my $gid=(getgrnam($config{wrappergroup}))[2]; if (! defined $gid) { diff --combined templates/page.tmpl index d4d681084,7e850a56b..0597b04f7 --- a/templates/page.tmpl +++ b/templates/page.tmpl @@@ -1,15 -1,19 +1,16 @@@ - + + <TMPL_VAR TITLE> - - - - - - - - - + + + + + + @@@ -19,52 -23,26 +20,52 @@@ -
-
- - +
+ + + + + +

+ + + + + +
+ +
+ + - - -
- -
- - -
- -
- - -
- - -
-Add a comment -
- -
Comments on this page are closed.
- -
- - - + +