projects / catagits/Catalyst-Runtime.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw
Fixed streaming write from a filehandle to stop writing if the browser is closed
[catagits/Catalyst-Runtime.git] / lib / Catalyst / Engine.pm
diff --git a/lib/Catalyst/Engine.pm b/lib/Catalyst/Engine.pm
index 2230908..920fe0e 100644 (file)
--- a/lib/Catalyst/Engine.pm
+++ b/lib/Catalyst/Engine.pm
@@ -47,7 +47,7 @@ sub finalize_body {
     if ( ref $c->response->body && $c->response->body->can('read') ) {
         while ( !$c->response->body->eof() ) {
             $c->response->body->read( my $buffer, $CHUNKSIZE );
-            $self->write( $c, $buffer );
+            last unless $self->write( $c, $buffer );
         }
         $c->response->body->close();
     }
@@ -90,7 +90,7 @@ sub finalize_cookies {
 sub finalize_error {
     my ( $self, $c ) = @_;
 
-    $c->res->headers->content_type('text/html');
+    $c->res->content_type('text/html; charset=utf-8');
     my $name = $c->config->{name} || 'Catalyst Application';
 
     my ( $title, $error, $infos );
@@ -99,10 +99,11 @@ sub finalize_error {
         # For pretty dumps
         local $Data::Dumper::Terse = 1;
         $error = join '',
-          map { '<code class="error">' . encode_entities($_) . '</code>' }
+          map { '<p><code class="error">' . encode_entities($_) . '</code></p>' }
           @{ $c->error };
         $error ||= 'No output';
         $title = $name = "$name on Catalyst $Catalyst::VERSION";
+        $name = "<h1>$name</h1>";
 
         # Don't show context in the dump
         delete $c->req->{_context};
@@ -124,12 +125,7 @@ sub finalize_error {
             my $name  = $dump->[0];
             my $value = encode_entities( Dumper $dump->[1] );
             push @infos, sprintf <<"EOF", $name, $value;
-<div>
-    <b><u>
-        <a href="#" onclick="toggleDump(dump_$i); return false">%s</a>
-    </u></b>
-</div>
-<br/>
+<h2><a href="#" onclick="toggleDump('dump_$i'); return false">%s</a></h2>
 <div id="dump_$i">
     <pre>%s</pre>
 </div>
@@ -156,17 +152,22 @@ EOF
         $name = '';
     }
     $c->res->body( <<"" );
-<html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
+    <meta http-equiv="Content-Language" content="en" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>$title</title>
-    <script language="JavaScript">
+    <script type="text/javascript">
         <!--
         function toggleDump (dumpElement) {
-            if (dumpElement.style.display == "none") {
-                dumpElement.style.display = "";
+            var e = document.getElementById( dumpElement );
+            if (e.style.display == "none") {
+                e.style.display = "";
             }
             else {
-                dumpElement.style.display = "none";
+                e.style.display = "none";
             }
         }
         -->
@@ -184,6 +185,7 @@ EOF
             color: #ddd;
         }
         div.box {
+            position: relative;
             background-color: #ccc;
             border: 1px solid #aaa;
             padding: 4px;
@@ -219,6 +221,20 @@ EOF
             overflow: auto;
             white-space: pre;
         }
+        div.name h1, div.error p {
+            margin: 0;
+        }
+        h2 {
+            margin-top: 0;
+            margin-bottom: 10px;
+            font-size: medium;
+            font-weight: bold;
+            text-decoration: underline;
+        }
+        h1 {
+            font-size: medium;
+            font-weight: normal;
+        }
     </style>
 </head>
 <body>
The Perl MVC Framework (catagits@git.shadowcat.co.uk:Catalyst-Runtime.git)