diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-08-12 18:32:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-12 18:32:31 -0700 |
| commit | 2dc3b199af028a8f563f582b367c163e054c44d5 (patch) | |
| tree | cfc0a58b5fb4d859325c39bb690fd33d76d97423 /gitweb | |
| parent | Merge branch 'bc/use-more-hardlinks-in-install' (diff) | |
| parent | gitweb: allow configurations that change with each request (diff) | |
| download | tgif-2dc3b199af028a8f563f582b367c163e054c44d5.tar.xz | |
Merge branch 'jn/maint-gitweb-dynconf'
* jn/maint-gitweb-dynconf:
gitweb: allow configurations that change with each request
Diffstat (limited to 'gitweb')
| -rwxr-xr-x | gitweb/gitweb.perl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 4efeebc227..898b121b50 100755 --- 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; |