From: John 'Warthog9' Hawley <warthog9@xxxxxxxxxx> If one of $site_header, $site_footer or $home_text is not defined you get extraneous errors in the web logs, for example (line wrapped for better readibility): [Wed Jan 13 16:55:42 2010] [error] [client ::1] [Wed Jan 13 16:55:42 2010] gitweb.cgi: Use of uninitialized value $site_header in -f at /var/www/gitweb/gitweb.cgi line 3287., referer: http://git/gitweb.cgi This ensures that those variables are defined before trying to use it. Note that such error can happen only because of an error in gitweb config file; building gitweb.cgi can make mentioned variables holding empty string (it is even the default), but they not undefined. Signed-off-by: John 'Warthog9' Hawley <warthog9@xxxxxxxxxx> Signed-off-by: Jakub Narebski <jnareb@xxxxxxxxx> --- Changes from version from 'Gitweb caching v5' and git://git.kernel.org/pub/scm/git/warthog9/gitweb.git gitweb-ml-v5 * Check explicitly that $site_header is defined, and not only that it is false-ish * Check also for $site_footer and $home_text being defined * Slightly more detailed commit message I have decided not to protect against undefined $projects_list, as such check would have to be more complicated and quite different from checks for $site_header, $site_footer and $home_text. Note that it is purely defensive programming, as this should not happen unless there are very strange errors in gitweb config file. gitweb/gitweb.perl | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index e2522cc..a4148d3 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -3254,7 +3254,7 @@ EOF print "</head>\n" . "<body>\n"; - if (-f $site_header) { + if (defined $site_header && -f $site_header) { insert_file($site_header); } @@ -3355,7 +3355,7 @@ sub git_footer_html { print "</div>\n"; # class="page_footer" } - if (-f $site_footer) { + if (defined $site_footer && -f $site_footer) { insert_file($site_footer); } @@ -4781,7 +4781,7 @@ sub git_project_list { } git_header_html(); - if (-f $home_text) { + if (defined $home_text && -f $home_text) { print "<div class=\"index_include\">\n"; insert_file($home_text); print "</div>\n"; -- 1.6.6.1 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html