aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2011-06-03 14:36:31 -0400
committerJoey Hess <joey@kitenet.net>2011-06-03 14:36:31 -0400
commit254080bc85a8f44d209158cc25af2f1f485c53cb (patch)
tree98ee00f1ed423ef8202c716c2a9b3ff4dbdcc8fb
parent138e12846e1f1b6992074095d3e3daefda465d2b (diff)
downloadikiwiki-254080bc85a8f44d209158cc25af2f1f485c53cb.tar
ikiwiki-254080bc85a8f44d209158cc25af2f1f485c53cb.tar.gz
Support the Hiawatha web server which sets HTTPS=off rather than not setting it. (There does not seem to be a standard here.)
-rw-r--r--IkiWiki/CGI.pm2
-rw-r--r--debian/changelog2
2 files changed, 3 insertions, 1 deletions
diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index cb4f395a0..a372f7351 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} && $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 feb4cff81..5985a7fed 100644
--- 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