From: Anders Kaseorg <andersk@mit.edu>
Date: Fri, 31 Jan 2014 05:53:28 +0000 (-0500)
Subject: Merge commit '4dbb8120f760d9009f0c2639f2ccb9808150aed5' into sipb
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/ac5fe2c33bd24af866661062e77e404e4fdfb01f

Merge commit '4dbb8120f760d9009f0c2639f2ccb9808150aed5' into sipb

Conflicts:
	IkiWiki/Wrapper.pm
---

ac5fe2c33bd24af866661062e77e404e4fdfb01f
diff --cc IkiWiki/Wrapper.pm
index 390f2ea39,84cc7540b..80091f5a6
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@@ -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) {