X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=blobdiff_plain;f=IkiWiki.pm;h=52da3c112b26289298ef2a4a1faf7636ec6ff119;hp=0a788f35bd69411e4ee536903fd8acc7a8580452;hb=b1cd1c067f5f5d20afc4db3731fa5cebaeed0635;hpb=c22f316ae153af4dba1a8a09ee743807d636bace

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 0a788f35b..52da3c112 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -118,6 +118,22 @@ sub getsetup () {
 		safe => 0,
 		rebuild => 0,
 	},
+	cgi_overload_delay => {
+		type => "string",
+		default => '',
+		example => "10",
+		description => "number of seconds to delay CGI requests when overloaded",
+		safe => 1,
+		rebuild => 0,
+	},
+	cgi_overload_message => {
+		type => "string",
+		default => '',
+		example => "Please wait",
+		description => "message to display when overloaded (may contain html)",
+		safe => 1,
+		rebuild => 0,
+	},
 	rcs => {
 		type => "string",
 		default => '',
@@ -1092,6 +1108,11 @@ sub cgiurl (@) {
 		join("&", map $_."=".uri_escape_utf8($params{$_}), keys %params);
 }
 
+sub cgiurl_abs (@) {
+	eval q{use URI};
+	URI->new_abs(cgiurl(@_), $config{cgiurl});
+}
+
 sub baseurl (;$) {
 	my $page=shift;
 
@@ -1156,7 +1177,7 @@ sub strftime_utf8 {
 	# strftime doesn't know about encodings, so make sure
 	# its output is properly treated as utf8.
 	# Note that this does not handle utf-8 in the format string.
-	$strftime_encoding = POSIX::setlocale(&POSIX::LC_TIME) =~ m#\.([^@]+)#
+	($strftime_encoding) = POSIX::setlocale(&POSIX::LC_TIME) =~ m#\.([^@]+)#
 		unless defined $strftime_encoding;
 	$strftime_encoding
 		? Encode::decode($strftime_encoding, POSIX::strftime(@_))