[PATCH] use do() instead of require() to include configuration
- From
- Dennis Stosberg <dennis@stosberg.net>
- Date
- Aug 29, 2006, 07:19 UTC
- Message-ID
- <20060829071902.G648e8860@leonov.stosberg.net>
- In-Reply-To
- <11567801982990-git-send-email-jnareb@gmail.com>
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> --- gitweb/gitweb.perl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 352236b..39ebcf4 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -152,7 +152,7 @@ # - one might want to include '-B' optio 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";
-- 1.4.2