gitweb: allow configurations that change with each request

gitolite's contrib/gitweb/gitweb.conf includes:

	$ENV{GL_USER} = $cgi->remote_user || "gitweb";

which is useful for setups where a user has to be authenticated
to access certain repos.  Perhaps other typical configurations
change per session in other ways, too.

v1.7.2-rc2~6 (gitweb: Move evaluate_gitweb_config out of run_request,
2010-07-05) broke such configurations for a speedup, by loading
the configuration once per FastCGI process.

Probably in the end there should be a way to specify in the
configuration whether a particular installation wants the speedup or
the flexibility.  But for now it is easier to just undo the relevant
change.

This partially reverts commit 869d58813b.

Reported-by: Julio Lajara <julio.lajara@alum.rpi.edu>
Analysis-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jonathan Nieder 2010-07-30 22:01:59 -05:00 коммит произвёл Junio C Hamano
Родитель 64fdc08dac
Коммит 7f425db914
1 изменённых файлов: 4 добавлений и 4 удалений

Просмотреть файл

@ -1037,8 +1037,12 @@ sub run_request {
reset_timer(); reset_timer();
evaluate_uri(); evaluate_uri();
evaluate_gitweb_config();
check_loadavg(); check_loadavg();
# $projectroot and $projects_list might be set in gitweb config file
$projects_list ||= $projectroot;
evaluate_query_params(); evaluate_query_params();
evaluate_path_info(); evaluate_path_info();
evaluate_and_validate_params(); evaluate_and_validate_params();
@ -1086,12 +1090,8 @@ sub evaluate_argv {
sub run { sub run {
evaluate_argv(); evaluate_argv();
evaluate_gitweb_config();
evaluate_git_version(); evaluate_git_version();
# $projectroot and $projects_list might be set in gitweb config file
$projects_list ||= $projectroot;
$pre_listen_hook->() $pre_listen_hook->()
if $pre_listen_hook; if $pre_listen_hook;