resolve firewall/index.cgi merge conflict

.gitignore

@@ -0,0 +1,22 @@
+# thumbnails
+Thumbs.db
+.xvpics
+
+# python byte-compiled
+*.py[cod]
+
+# temp files
+*~
+*.bak
+test
+*.tmp
+*.site
+core
+
+# build files
+.builds
+.build
+
+# makedist.pl
+tarballs/
+minimal/

README

@@ -1,4 +1,4 @@
-Webmin Version 1.850
+Webmin Version 1.860
 --------------------
 Webmin is a web-based interface for system administration for Unix. 
 Using any browser that supports tables and forms, you can setup user

apache/mod_negotiation.pl

@@ -45,7 +45,7 @@ return (2, "$text{'mod_negotiation_pri'}",
 sub save_LanguagePriority
 {
 local $rv = &parse_opt("LanguagePriority", '\S', $text{'mod_negotiation_epri'});
-if ($rv) {
+if ($rv && @$rv) {
 	$rv->[0] =~ s/^"(.*)"/$1/g;
 	}
 return $rv;

backup-config/backup.cgi

@@ -47,7 +47,7 @@ else {
 		&unlink_file($temp);
 		&error($err);
 		}
-	print "Content-type: application/octet-stream\n\n";
+	print "Content-type: application/x-gzip\n\n";
 	my $buf;
 	open(TEMP, $temp);
 	while(read(TEMP, $buf, 1024)) {