]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge commit '4dbb8120f760d9009f0c2639f2ccb9808150aed5' into sipb
authorAnders Kaseorg <andersk@mit.edu>
Fri, 31 Jan 2014 05:53:28 +0000 (00:53 -0500)
committerAnders Kaseorg <andersk@mit.edu>
Fri, 31 Jan 2014 05:53:28 +0000 (00:53 -0500)
Conflicts:
IkiWiki/Wrapper.pm

1  2 
IkiWiki/CGI.pm
IkiWiki/Plugin/git.pm
IkiWiki/Plugin/httpauth.pm
IkiWiki/Plugin/parentlinks.pm
IkiWiki/Wrapper.pm

diff --cc IkiWiki/CGI.pm
Simple merge
Simple merge
Simple merge
Simple merge
index 390f2ea39a3233ba4eaf649d45fa8adc5ecb473a,84cc7540bbfa5e63b8d9d85d21cc0b0d63bbb478..80091f5a6cc8240eb367eee653e07859354937a4
@@@ -28,7 -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_COOKIE REMOTE_USER HTTPS SSL_CLIENT_S_DN_CN REDIRECT_STATUS
+                      HTTP_HOST SERVER_PORT HTTPS
                       REDIRECT_URL} if $config{cgi};
        my $envsave="";
        foreach my $var (@envsave) {