From: Dennis Stosberg <dennis@stosberg.net>
Date: Tue, 29 Aug 2006 07:19:02 +0000 (+0200)
Subject: use do() instead of require() to include configuration
X-Git-Tag: v1.4.3-rc1~152
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4b5dc988c0db1e7ce5ba41c09a1e75cbc71c3f35;p=git.git

use do() instead of require() to include configuration

When run under mod_perl, require() will read and execute the configuration
file on the first invocation only.  On every subsequent invocation, all
configuration variables will be reset to their default values.  do() reads
and executes the configuration file unconditionally.

Signed-off-by: Dennis Stosberg <dennis@stosberg.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 68f40bda8..7922c3ce5 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -152,7 +152,7 @@ sub feature_snapshot {
 our @diff_opts = ('-M'); # taken from git_commit
 
 our $GITWEB_CONFIG = $ENV{'GITWEB_CONFIG'} || "++GITWEB_CONFIG++";
-require $GITWEB_CONFIG if -e $GITWEB_CONFIG;
+do $GITWEB_CONFIG if -e $GITWEB_CONFIG;
 
 # version of the core git binary
 our $git_version = qx($GIT --version) =~ m/git version (.*)$/ ? $1 : "unknown";