Merge branch 'jn/maint-gitweb-dynconf'

* jn/maint-gitweb-dynconf:
  gitweb: allow configurations that change with each request
maint
Junio C Hamano 2010-08-12 18:32:31 -07:00
commit 2dc3b199af
1 changed files with 4 additions and 4 deletions

View File

@ -1060,8 +1060,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();
@ -1109,12 +1113,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;