summaryrefslogtreecommitdiff
path: root/git-instaweb.sh
diff options
context:
space:
mode:
authorDan McGee <dpmcgee@gmail.com>2010-06-29 21:44:59 -0500
committerEric Wong <normalperson@yhbt.net>2010-07-23 11:13:47 -0700
commit2989f516d54a8d453edefbfe955459d7944aedb5 (patch)
treed9208b53222241514acdd6cc3ef69f2f545222c9 /git-instaweb.sh
parent1849f01b5b6b442c131d9b88bf39bb8671058a98 (diff)
downloadgit-2989f516d54a8d453edefbfe955459d7944aedb5.tar.gz
git-instaweb: Fix Apache environment variable passing
We were passing the non-existent GIT_EXEC_DIR through instead of the real GIT_EXEC_PATH. In addition, these weren't being passed at all for CGI (non mod_perl) execution so get them included there as well. Signed-off-by: Dan McGee <dpmcgee@gmail.com> Acked-by: Eric Wong <normalperson@yhbt.net>
Diffstat (limited to 'git-instaweb.sh')
-rwxr-xr-xgit-instaweb.sh7
1 files changed, 5 insertions, 2 deletions
diff --git a/git-instaweb.sh b/git-instaweb.sh
index a01476a80f..1d349b88de 100755
--- a/git-instaweb.sh
+++ b/git-instaweb.sh
@@ -314,7 +314,7 @@ PidFile "$fqgitdir/pid"
Listen $bind$port
EOF
- for mod in mime dir log_config; do
+ for mod in mime dir env log_config; do
if test -e $module_path/mod_${mod}.so; then
echo "LoadModule ${mod}_module " \
"$module_path/mod_${mod}.so" >> "$conf"
@@ -334,7 +334,7 @@ EOF
cat >> "$conf" <<EOF
LoadModule perl_module $module_path/mod_perl.so
PerlPassEnv GIT_DIR
-PerlPassEnv GIT_EXEC_DIR
+PerlPassEnv GIT_EXEC_PATH
PerlPassEnv GITWEB_CONFIG
<Location /gitweb.cgi>
SetHandler perl-script
@@ -364,6 +364,9 @@ EOF
echo "ScriptSock logs/gitweb.sock" >> "$conf"
fi
cat >> "$conf" <<EOF
+PassEnv GIT_DIR
+PassEnv GIT_EXEC_PATH
+PassEnv GITWEB_CONFIG
AddHandler cgi-script .cgi
<Location /gitweb.cgi>
Options +ExecCGI