Jakub Narębski committed 869d588

gitweb: Move evaluate_gitweb_config out of run_request

Move evaluate_gitweb_config() and evaluate_git_version() out of
run_request() to run(), making them not run one for each request.
This changes how git behaves in FastCGI case.

This change makes it impossible to have config which changes with
request, but I don't think anyone relied on such (hidden action)

While at it, reset timer and number of git commands at beginning of
run_request() in new reset_timer() subroutine. This fixes case when
gitweb was run using FastCGI interface: time is reported for request,
and not for single run of gitweb script. This changes slightly
behavior in non-FastCGI case: the number of git commands reported is
1 less (running `git --version` one per gitweb is not counted now).

Signed-off-by: Jakub Narebski <>
Signed-off-by: Junio C Hamano <>

  • Participants
  • Parent commits 9ba0f03

Comments (0)

Files changed (1)

File gitweb/gitweb.perl

-sub run_request {
+sub reset_timer {
 	our $t0 = [Time::HiRes::gettimeofday()]
 		if defined $t0;
+	our $number_of_git_cmds = 0;
+sub run_request {
+	reset_timer();
-	evaluate_gitweb_config();
-	evaluate_git_version();
-	# $projectroot and $projects_list might be set in gitweb config file
-	$projects_list ||= $projectroot;
 sub run {
+	evaluate_gitweb_config();
+	evaluate_git_version();
+	# $projectroot and $projects_list might be set in gitweb config file
+	$projects_list ||= $projectroot;
 		if $pre_listen_hook;