mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-instaweb: Fix Apache environment variable passing

Browse Source 
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>
This commit is contained in:
Dan McGee
2010-06-29 21:44:59 -05:00
committed by Eric Wong
parent 1849f01b5b
commit 2989f516d5
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
git-instaweb.sh
View File

@ -314,7 +314,7 @@ PidFile "$fqgitdir/pid"
Listen $bind$port Listen $bind$port
EOF 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 if test -e $module_path/mod_${mod}.so; then
echo "LoadModule ${mod}_module " \ echo "LoadModule ${mod}_module " \
"$module_path/mod_${mod}.so" >> "$conf" "$module_path/mod_${mod}.so" >> "$conf"
@ -334,7 +334,7 @@ EOF
cat >> "$conf" <<EOF cat >> "$conf" <<EOF
LoadModule perl_module $module_path/mod_perl.so LoadModule perl_module $module_path/mod_perl.so
PerlPassEnv GIT_DIR PerlPassEnv GIT_DIR
PerlPassEnv GIT_EXEC_DIR PerlPassEnv GIT_EXEC_PATH
PerlPassEnv GITWEB_CONFIG PerlPassEnv GITWEB_CONFIG
<Location /gitweb.cgi> <Location /gitweb.cgi>
SetHandler perl-script SetHandler perl-script
@ -364,6 +364,9 @@ EOF
echo "ScriptSock logs/gitweb.sock" >> "$conf" echo "ScriptSock logs/gitweb.sock" >> "$conf"
fi fi
cat >> "$conf" <<EOF cat >> "$conf" <<EOF
PassEnv GIT_DIR
PassEnv GIT_EXEC_PATH
PassEnv GITWEB_CONFIG
AddHandler cgi-script .cgi AddHandler cgi-script .cgi
<Location /gitweb.cgi> <Location /gitweb.cgi>
Options +ExecCGI Options +ExecCGI