diff options
| author | Dennis Stosberg <dennis@stosberg.net> | 2006-08-29 09:19:02 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-08-31 12:57:08 -0700 |
| commit | 4b5dc988c0db1e7ce5ba41c09a1e75cbc71c3f35 (patch) | |
| tree | 9e44348885496d27cadc0daa8eab74c88ab242ee | |
| parent | 3a36bc846949df8a7fb0ad9b2fc8ffe294cdca7c (diff) | |
| download | git-4b5dc988c0db1e7ce5ba41c09a1e75cbc71c3f35.tar.gz git-4b5dc988c0db1e7ce5ba41c09a1e75cbc71c3f35.tar.xz | |
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>
| -rwxr-xr-x | gitweb/gitweb.perl | 2 |
1 files changed, 1 insertions, 1 deletions
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"; |