summaryrefslogtreecommitdiff
path: root/gitweb
diff options
context:
space:
mode:
authorRobert Fitzsimons <robfitz@273k.net>2006-12-23 03:35:16 +0000
committerJunio C Hamano <junkio@cox.net>2006-12-22 23:18:42 -0800
commit6be935115b4a3bfa9062875a569d4a018ac372e2 (patch)
tree0468f3167f22b87cbf0b75cc46083f6aa9087095 /gitweb
parent9d032c725034e7c072f8c1a3e11855594c2fc0af (diff)
downloadgit-6be935115b4a3bfa9062875a569d4a018ac372e2.tar.gz
gitweb: Allow search to be disabled from the config file.
Signed-off-by: Robert Fitzsimons <robfitz@273k.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'gitweb')
-rwxr-xr-xgitweb/gitweb.perl13
1 files changed, 13 insertions, 0 deletions
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 9061c4a75e..9a4f3b4841 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -128,6 +128,12 @@ our %feature = (
# => [content-encoding, suffix, program]
'default' => ['x-gzip', 'gz', 'gzip']},
+ # Enable text search, which will list the commits which match author,
+ # committer or commit text to a given string. Enabled by default.
+ 'search' => {
+ 'override' => 0,
+ 'default' => [1]},
+
# Enable the pickaxe search, which will list the commits that modified
# a given string in a file. This can be practical and quite faster
# alternative to 'blame', but still potentially CPU-intensive.
@@ -1730,6 +1736,9 @@ EOF
print " / $action";
}
print "\n";
+ }
+ my ($have_search) = gitweb_check_feature('search');
+ if ((defined $project) && ($have_search)) {
if (!defined $searchtext) {
$searchtext = "";
}
@@ -4151,6 +4160,10 @@ sub git_history {
}
sub git_search {
+ my ($have_search) = gitweb_check_feature('search');
+ if (!$have_search) {
+ die_error('403 Permission denied', "Permission denied");
+ }
if (!defined $searchtext) {
die_error(undef, "Text field empty");
}