aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--IkiWiki/CGI.pm3
-rw-r--r--debian/changelog1
2 files changed, 3 insertions, 1 deletions
diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index d20a75923..f1eb31d97 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -490,7 +490,8 @@ sub cgierror ($) {
print "Content-type: text/html\n\n";
print cgitemplate(undef, gettext("Error"),
"<p class=\"error\">".gettext("Error").": $message</p>");
- die $@;
+
+ die $message;
}
1
diff --git a/debian/changelog b/debian/changelog
index 005c811d3..a92e3711e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ ikiwiki (3.20170112) UNRELEASED; urgency=medium
* Guard against set-but-empty REMOTE_USER CGI variable on
misconfigured nginx servers, and in general treat sessions with
a set-but-empty name as if they were not signed in.
+ * When the CGI fails, print the error to stderr, not "Died"
-- Simon McVittie <smcv@debian.org> Sun, 14 May 2017 15:34:52 +0100