@matheusbsbs / matheus-bagliano / commits / 24d4afcdc7
Fork 0

gitweb: Check that $site_header etc. are defined before using them

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 are still defined. Signed-off-by: John 'Warthog9' Hawley <warthog9@kernel.org> Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

John 'Warthog9' Hawley committed Jan 30, 2010 at 23:30 UTC 24d4afcdc79cb250131841040b803401d261a473
1 file changed +3 -3
gitweb/gitweb.perl
+3 -3
@@ -3254,7 +3254,7 @@ EOF
3254 print "</head>\n" .
3255 "<body>\n";
3256
3257 - if (-f $site_header) {
3257 + if (defined $site_header && -f $site_header) {
3258 insert_file($site_header);
3259 }
3260
@@ -3355,7 +3355,7 @@ sub git_footer_html {
3355 print "</div>\n"; # class="page_footer"
3356 }
3357
3358 - if (-f $site_footer) {
3358 + if (defined $site_footer && -f $site_footer) {
3359 insert_file($site_footer);
3360 }
3361
@@ -4781,7 +4781,7 @@ sub git_project_list {
4781 }
4782
4783 git_header_html();
4784 - if (-f $home_text) {
4784 + if (defined $home_text && -f $home_text) {
4785 print "<div class=\"index_include\">\n";
4786 insert_file($home_text);
4787 print "</div>\n";