threads / patch / 23477

patchgit-instaweb: pass through invoking user's path to gitweb CGI scripts

Subject: [PATCH] git-instaweb: pass through invoking user's path to gitweb CGI scripts

## tl;dr

3 messages between Apr 15, 2010 and Apr 17, 2010. Diffs are folded; open one to read it.

replies: 2people: 3as markdown or json

Chris Webb· Apr 15, 2010, 13:29 UTC · lore

When used with lighttpd or mongoose, git-instaweb previously passed a hard-coded, default value of PATH to the gitweb CGI script. Use the invoking user's value for PATH for this instead. (This is already implicitly the behaviour for other web servers supported by git-instaweb.)

Signed-off-by: Chris Webb <chris@arachsys.com>
---
 git-instaweb.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
Show changes to git-instaweb.sh +2 −2
diff --git a/git-instaweb.sh b/git-instaweb.sh
index d4941a9..f608014 100755
--- a/git-instaweb.sh
+++ b/git-instaweb.sh
@@ -212,7 +212,7 @@ server.errorlog = "$fqgitdir/gitweb/error.log"
 # variable above and uncomment this
 #accesslog.filename = "$fqgitdir/gitweb/access.log"
 
-setenv.add-environment = ( "PATH" => "/usr/local/bin:/usr/bin:/bin" )
+setenv.add-environment = ( "PATH" => env.PATH )
 
 cgi.assign = ( ".cgi" => "" )
 
@@ -361,7 +361,7 @@ error_log	$fqgitdir/gitweb/error.log
 access_log	$fqgitdir/gitweb/access.log
 
 #cgi setup
-cgi_env		PATH=/usr/local/bin:/usr/bin:/bin,GIT_DIR=$GIT_DIR,GIT_EXEC_PATH=$GIT_EXEC_PATH
+cgi_env		PATH=$PATH,GIT_DIR=$GIT_DIR,GIT_EXEC_PATH=$GIT_EXEC_PATH
 cgi_interp	$PERL
 cgi_ext		cgi,pl
 

-- 
1.7.0.3
Eric Wong· Apr 16, 2010, 06:34 UTC · re: Chris Webb · lore

Re: [PATCH] git-instaweb: pass through invoking user's path to gitweb CGI scripts

Chris Webb <chris@arachsys.com> wrote:
Show 6 quoted lines
> When used with lighttpd or mongoose, git-instaweb previously passed a
> hard-coded, default value of PATH to the gitweb CGI script. Use the invoking
> user's value for PATH for this instead. (This is already implicitly the
> behaviour for other web servers supported by git-instaweb.)
> 
> Signed-off-by: Chris Webb <chris@arachsys.com>
Looks good to me, thanks Chris.
Acked-by: Eric Wong <normalperson@yhbt.net>
Show 29 quoted lines
> ---
>  git-instaweb.sh |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/git-instaweb.sh b/git-instaweb.sh
> index d4941a9..f608014 100755
> --- a/git-instaweb.sh
> +++ b/git-instaweb.sh
> @@ -212,7 +212,7 @@ server.errorlog = "$fqgitdir/gitweb/error.log"
>  # variable above and uncomment this
>  #accesslog.filename = "$fqgitdir/gitweb/access.log"
>  
> -setenv.add-environment = ( "PATH" => "/usr/local/bin:/usr/bin:/bin" )
> +setenv.add-environment = ( "PATH" => env.PATH )
>  
>  cgi.assign = ( ".cgi" => "" )
>  
> @@ -361,7 +361,7 @@ error_log	$fqgitdir/gitweb/error.log
>  access_log	$fqgitdir/gitweb/access.log
>  
>  #cgi setup
> -cgi_env		PATH=/usr/local/bin:/usr/bin:/bin,GIT_DIR=$GIT_DIR,GIT_EXEC_PATH=$GIT_EXEC_PATH
> +cgi_env		PATH=$PATH,GIT_DIR=$GIT_DIR,GIT_EXEC_PATH=$GIT_EXEC_PATH
>  cgi_interp	$PERL
>  cgi_ext		cgi,pl
>  
> -- 
> 1.7.0.3
>

← back to recent threads