Support the Hiawatha web server which sets HTTPS=off rather than not setting it....

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index cb4f395a063076a64e0c33e95d220f2f8581602f..a372f73514b52363f3a7c9a2c6ad6e36908267fb 100644 (file)
--- 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} && $ENV{HTTPS} ne "off") || $config{sslcookie}) {
                print $session->header(-charset => 'utf-8',
                        -cookie => $session->cookie(-httponly => 1, -secure => 1));
        }

diff --git a/debian/changelog b/debian/changelog
index feb4cff8199e45d6044d5ff0f6a1eb199855afde..5985a7fedbc18419a48975d58a76b0a174002090 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ ikiwiki (3.20110431) UNRELEASED; urgency=low
   * po: support language codes in the form of 'es_AR', and 'arn'. (intrigeri)
     Closes: #627844
   * po: Make po4a warn, not error on a malformed document. (intrigeri)
+  * Support the Hiawatha web server which sets HTTPS=off rather than not
+    setting it. (There does not seem to be a standard here.)
 
  -- Joey Hess <joeyh@debian.org>  Thu, 05 May 2011 13:02:19 -0400