From: Joey Hess <joey@kodama.kitenet.net>
Date: Tue, 1 Jul 2008 00:01:10 +0000 (-0400)
Subject: Configure CGI.pm to disable file uploads by default.
X-Git-Tag: 2.52~14^2~37
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8e43bc0e0fef57a0770ef69e9aac845ed6078dfa;p=ikiwiki.git

Configure CGI.pm to disable file uploads by default.
---

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 015c9ae01..43986789a 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -667,10 +667,11 @@ sub cgi (;$$) { #{{{
 	my $q=shift;
 	my $session=shift;
 
+	eval q{use CGI};
+	error($@) if $@;
+	$CGI::DISABLE_UPLOADS=1;
+
 	if (! $q) {
-		eval q{use CGI};
-		error($@) if $@;
-	
 		binmode(STDIN);
 		$q=CGI->new;
 		binmode(STDIN, ":utf8");
diff --git a/debian/changelog b/debian/changelog
index 9153254b4..8e1ad074c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ikiwiki (2.52) UNRELEASED; urgency=low
+
+  * Configure CGI.pm to disable file uploads by default.
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 30 Jun 2008 19:56:28 -0400
+
 ikiwiki (2.51) unstable; urgency=low
 
   * Improve toplevel parentlink to link directly to index.html when usedirs is