Simple enough, $cache_enable (along with all caching variables) are
already in production in multiple places and doing a small semantic
change without backwards compatibility is pointless breakage.
This reverts back to the previous variable to enable / disable caching
Signed-off-by: John 'Warthog9' Hawley <warthog9@xxxxxxxxxxxxxx>
---
gitweb/gitweb.perl | 12 ++++++------
t/gitweb-lib.sh | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 05e7ba6..5eb0309 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -258,7 +258,7 @@ our $maxload = 300;
# that the cache directory be periodically completely deleted, and this is safe to perform.
# Suggested mechanism
# mv $cacheidr $cachedir.flush;mkdir $cachedir;rm -rf $cachedir.flush
-our $caching_enabled = 0;
+our $cache_enable = 0;
# Used to set the minimum cache timeout for the dynamic caching algorithm. Basically
# if we calculate the cache to be under this number of seconds we set the cache timeout
@@ -1138,7 +1138,7 @@ sub dispatch {
!$project) {
die_error(400, "Project needed");
}
- if ($caching_enabled && is_cacheable($action)) {
+ if ($cache_enable && is_cacheable($action)) {
cache_fetch($action);
} else {
$actions{$action}->();
@@ -3516,7 +3516,7 @@ sub git_header_html {
if (defined $cgi->http('HTTP_ACCEPT') &&
$cgi->http('HTTP_ACCEPT') =~ m/(,|;|\s|^)application\/xhtml\+xml(,|;|\s|$)/ &&
$cgi->Accept('application/xhtml+xml') != 0 &&
- !$caching_enabled) {
+ !$cache_enable) {
$content_type = 'application/xhtml+xml';
} else {
$content_type = 'text/html';
@@ -3757,7 +3757,7 @@ sub die_error {
#
# Reset the output so that we are actually going to STDOUT as opposed
# to buffering the output.
- reset_output() if ($caching_enabled);
+ reset_output() if ($cache_enable && ! $cacheErrorCache);
git_header_html($http_responses{$status}, undef, %opts);
print <<EOF;
@@ -5667,7 +5667,7 @@ sub git_blob_plain {
($sandbox ? 'attachment' : 'inline')
. '; filename="' . $save_as . '"');
local $/ = undef;
- if ($caching_enabled) {
+ if ($cache_enable) {
open BINOUT, '>', $fullhashbinpath or die_error(500, "Could not open bin dump file");
}else{
open BINOUT, '>&', \$fullhashbinpath or die_error(500, "Could not open bin dump file");
@@ -5960,7 +5960,7 @@ sub git_snapshot {
open my $fd, "-|", $cmd
or die_error(500, "Execute git-archive failed");
- if ($caching_enabled) {
+ if ($cache_enable) {
open BINOUT, '>', $fullhashbinpath or die_error(500, "Could not open bin dump file");
}else{
open BINOUT, '>&', \$fullhashbinpath or die_error(500, "Could not open bin dump file");
diff --git a/t/gitweb-lib.sh b/t/gitweb-lib.sh
index 10c4a3d..a0f7696 100755
--- a/t/gitweb-lib.sh
+++ b/t/gitweb-lib.sh
@@ -56,7 +56,7 @@ EOF
gitweb_enable_caching () {
test_expect_success 'enable caching' '
cat >>gitweb_config.perl <<-\EOF &&
- our $caching_enabled = 1;
+ our $cache_enable = 1;
our $minCacheTime = 60*60*24*7*30; # very long expiration time for tests (a month)
our $maxCacheTime = 60*60*24*7*30*365; # upper bound for dynamic (adaptive) caching
our $cachedir = "cache"; # for testsuite to clear the right thing
--
1.7.2.3
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html