X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/4a6ac6b485c7e6e312e42c3c609df693f5e531ec..94268a46cd30fc72b51714e42e9db741eb29cc73:/IkiWiki/CGI.pm

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 30d108a81..6a04decb6 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -12,7 +12,7 @@ use Encode;
 sub printheader ($) {
 	my $session=shift;
 	
-	if ($ENV{HTTPS} || $config{sslcookie}) {
+	if (($ENV{HTTPS} && lc $ENV{HTTPS} ne "off") || $config{sslcookie}) {
 		print $session->header(-charset => 'utf-8',
 			-cookie => $session->cookie(-httponly => 1, -secure => 1));
 	}
@@ -79,7 +79,7 @@ sub cgitemplate ($$$;@) {
 		title => $title,
 		wikiname => $config{wikiname},
 		content => $content,
-		baseurl => urlabs(urlto(undef), $topurl),
+		baseurl => urlabs(baseurl(), $topurl),
 		html5 => $config{html5},
 		%params,
 	);