Merge commit 'd4a0732752e79b57509cee33001ab757132366c5' into sipb

[ikiwiki.git] / IkiWiki / Wrapper.pm

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index 84cc7540bbfa5e63b8d9d85d21cc0b0d63bbb478..f9630a982c3de2d87671d044425c758860f97b07 100644 (file)
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -48,8 +48,8 @@ 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_HOST SERVER_PORT HTTPS
+                      HTTP_COOKIE REMOTE_USER HTTPS SSL_CLIENT_S_DN_CN REDIRECT_STATUS
+                      HTTP_HOST SERVER_PORT HTTPS HTTP_ACCEPT
                       REDIRECT_URL} if $config{cgi};
        my $envsave="";
        foreach my $var (@envsave) {
@@ -219,7 +219,6 @@ EOF
                #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) {
@@ -237,8 +236,7 @@ EOF
                error("rename $wrapper.new $wrapper: $!");
        }
        #translators: The parameter is a filename.
-       printf(gettext("successfully generated %s"), $wrapper);
-       print "\n";
+       debug(sprintf(gettext("successfully generated %s"), $wrapper));
 }
 
 1