gitweb: Move evaluate_gitweb_config out of run_request

[Gitweb] / gitweb.perl

diff --git a/gitweb.perl b/gitweb.perl
index d3aa80fc318e7254723010c60d8f23e2e77f96c7fc39694c02b39905e5a14659..e533708f4224be48b0c5c49b5316e8de6ce90ecb4f027fcd0bf22ee9ce0552d6 100755 (executable)
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -1028,18 +1028,18 @@ sub dispatch {
        $actions{$action}->();
 }
 
        $actions{$action}->();
 }
 

-sub run_request {
+sub reset_timer {

        our $t0 = [Time::HiRes::gettimeofday()]
                if defined $t0;
        our $t0 = [Time::HiRes::gettimeofday()]
                if defined $t0;

+       our $number_of_git_cmds = 0;
+}
+
+sub run_request {
+       reset_timer();

 
        evaluate_uri();
 
        evaluate_uri();

-       evaluate_gitweb_config();
-       evaluate_git_version();

        check_loadavg();
 
        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();
        evaluate_query_params();
        evaluate_path_info();
        evaluate_and_validate_params();


@@ -1087,6 +1087,11 @@ sub evaluate_argv {
 
 sub run {
        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;
 
        $pre_listen_hook->()
                if $pre_listen_hook;