Merge branch 'jn/maint-gitweb-dynconf'

* jn/maint-gitweb-dynconf: gitweb: allow configurations that change with each request
git-mirror · Aug 13, 2010 · 2dc3b19 · 2dc3b19
2 parents 14661fe + 7f425db
commit 2dc3b19
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
@@ -1060,8 +1060,12 @@ sub run_request {
 	reset_timer();
 
 	evaluate_uri();
+	evaluate_gitweb_config();
 	check_loadavg();
 
+	# $projectroot and $projects_list might be set in gitweb config file
+	$projects_list ||= $projectroot;
+
 	evaluate_query_params();
 	evaluate_path_info();
 	evaluate_and_validate_params();
@@ -1109,12 +1113,8 @@ sub evaluate_argv {
 
 sub run {
 	evaluate_argv();
-	evaluate_gitweb_config();
 	evaluate_git_version();
 
-	# $projectroot and $projects_list might be set in gitweb config file
-	$projects_list ||= $projectroot;
-
 	$pre_listen_hook->()
 		if $pre_listen_hook;