Bug 255664: Wait until buglist is ready to be displayed before closing the "please wait" page when using server push, so any errors that occur can actually be seen by the user instead of getting a blank page.

r=myk, a=myk

1 files changed, 5 insertions, 1 deletions

diff --git a/buglist.cgi b/buglist.cgi
index 3c575d2b8..23fb92ec5 100755
--- a/buglist.cgi
+++ b/buglist.cgi
@@ -735,7 +735,9 @@ if ($serverpush) {
     $template->process("list/server-push.html.tmpl", $vars)
       || ThrowTemplateError($template->error());
 
-    print $cgi->multipart_end();
+    # Don't do multipart_end() until we're ready to display the replacement
+    # page, otherwise any errors that happen before then (like SQL errors)
+    # will result in a blank page being shown to the user instead of the error.
 }
 
 # Connect to the shadow database if this installation is using one to improve
@@ -964,6 +966,8 @@ if ($format->{'extension'} eq "csv") {
 }
 
 if ($serverpush) {
+    # close the "please wait" page, then open the buglist page
+    print $cgi->multipart_end();
     print $cgi->multipart_start(-type=>$contenttype);
 } else {
     # Suggest a name for the bug list if the user wants to save it as a file.