X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst%2FEngine.pm;h=0389367c3092713fb1e284965051452d3618ead4;hp=1f22735f53a5dd151bcad801102d34da026c9aab;hb=f3414019f472b55682ef3af53f761b6db7955887;hpb=7fa2c9c1b85c98786655ad5169708d8dc84e8353

diff --git a/lib/Catalyst/Engine.pm b/lib/Catalyst/Engine.pm
index 1f22735..0389367 100644
--- a/lib/Catalyst/Engine.pm
+++ b/lib/Catalyst/Engine.pm
@@ -1,5 +1,6 @@
 package Catalyst::Engine;
 
+use Class::C3;
 use Moose;
 with 'MooseX::Emulate::Class::Accessor::Fast';
 
@@ -16,8 +17,7 @@ use Scalar::Util ();
 has read_length => (is => 'rw');
 has read_position => (is => 'rw');
 
-# Stringify to class
-use overload '""' => sub { return ref shift }, fallback => 1;
+no Moose;
 
 # Amount of data to read from input on each pass
 our $CHUNKSIZE = 64 * 1024;
@@ -70,7 +70,9 @@ sub finalize_cookies {
     my @cookies;
     my $response = $c->response;
 
-    while( my($name, $val) = each %{ $response->cookies } ) {
+    foreach my $name (keys %{ $response->cookies }) {
+
+        my $val = $response->cookies->{$name};
 
         my $cookie = (
             Scalar::Util::blessed($val)
@@ -128,9 +130,6 @@ sub finalize_error {
         # Don't show body parser in the dump
         delete $c->req->{_body};
 
-        # Don't show response header state in dump
-        delete $c->res->{_finalized_headers};
-
         my @infos;
         my $i = 0;
         for my $dump ( $c->dump_these ) {
@@ -243,7 +242,7 @@ EOF
         }
         /* from http://users.tkk.fi/~tkarvine/linux/doc/pre-wrap/pre-wrap-css3-mozilla-opera-ie.html */
         /* Browser specific (not valid) styles to make preformatted text wrap */
-        pre {
+        pre { 
             white-space: pre-wrap;       /* css-3 */
             white-space: -moz-pre-wrap;  /* Mozilla, since 1999 */
             white-space: -pre-wrap;      /* Opera 4-6 */
@@ -293,7 +292,8 @@ sub finalize_uploads {
     my ( $self, $c ) = @_;
 
     my $request = $c->request;
-    while( my($key,$upload) = each %{ $request->uploads } ) {
+    foreach my $key (keys %{ $request->uploads }) {
+        my $upload = $request->uploads->{$key};
         unlink grep { -e $_ } map { $_->tempname }
           (ref $upload eq 'ARRAY' ? @{$upload} : ($upload));
     }
@@ -317,7 +317,7 @@ sub prepare_body {
             $request->{_body}->{tmpdir} = $c->config->{uploadtmp}
               if exists $c->config->{uploadtmp};
         }
-
+        
         while ( my $buffer = $self->read($c) ) {
             $c->prepare_body_chunk($buffer);
         }
@@ -350,15 +350,15 @@ sub prepare_body_chunk {
 
 =head2 $self->prepare_body_parameters($c)
 
-Sets up parameters from body.
+Sets up parameters from body. 
 
 =cut
 
 sub prepare_body_parameters {
     my ( $self, $c ) = @_;
-
+    
     return unless $c->request->{_body};
-
+    
     $c->request->body_parameters( $c->request->{_body}->param );
 }
 
@@ -404,12 +404,14 @@ sub prepare_parameters {
     my $body_parameters = $request->body_parameters;
     my $query_parameters = $request->query_parameters;
     # We copy, no references
-    while( my($name, $param) = each(%$query_parameters) ) {
+    foreach my $name (keys %$query_parameters) {
+        my $param = $query_parameters->{$name};
         $parameters->{$name} = ref $param eq 'ARRAY' ? [ @$param ] : $param;
     }
 
     # Merge query and body parameters
-    while( my($name, $param) = each(%$body_parameters) ) {
+    foreach my $name (keys %$body_parameters) {
+        my $param = $body_parameters->{$name};
         my @values = ref $param eq 'ARRAY' ? @$param : ($param);
         if ( my $existing = $parameters->{$name} ) {
           unshift(@values, (ref $existing eq 'ARRAY' ? @$existing : $existing));
@@ -436,7 +438,7 @@ process the query string and extract query parameters.
 
 sub prepare_query_parameters {
     my ( $self, $c, $query_string ) = @_;
-
+    
     # Check for keywords (no = signs)
     # (yes, index() is faster than a regex :))
     if ( index( $query_string, '=' ) < 0 ) {
@@ -448,17 +450,17 @@ sub prepare_query_parameters {
 
     # replace semi-colons
     $query_string =~ s/;/&/g;
-
+    
     my @params = split /&/, $query_string;
 
     for my $item ( @params ) {
-
-        my ($param, $value)
+        
+        my ($param, $value) 
             = map { $self->unescape_uri($_) }
               split( /=/, $item, 2 );
-
+          
         $param = $self->unescape_uri($item) unless defined $param;
-
+        
         if ( exists $query{$param} ) {
             if ( ref $query{$param} ) {
                 push @{ $query{$param} }, $value;
@@ -486,7 +488,7 @@ sub prepare_read {
 
     # Initialize the read position
     $self->read_position(0);
-
+    
     # Initialize the amount of data we think we need to read
     $self->read_length( $c->request->header('Content-Length') || 0 );
 }
@@ -511,7 +513,8 @@ sub prepare_uploads {
 
     my $uploads = $request->{_body}->upload;
     my $parameters = $request->parameters;
-    while(my($name,$files) = each(%$uploads) ) {
+    foreach my $name (keys %$uploads) {
+        my $files = $uploads->{$name};
         my @uploads;
         for my $upload (ref $files eq 'ARRAY' ? @$files : ($files)) {
             my $headers = HTTP::Headers->new( %{ $upload->{headers} } );
@@ -619,15 +622,15 @@ sub write {
         $self->prepare_write($c);
         $self->{_prepared_write} = 1;
     }
-
+    
     my $len   = length($buffer);
     my $wrote = syswrite STDOUT, $buffer;
-
+    
     if ( !defined $wrote && $! == EWOULDBLOCK ) {
         # Unable to write on the first try, will retry in the loop below
         $wrote = 0;
     }
-
+    
     if ( defined $wrote && $wrote < $len ) {
         # We didn't write the whole buffer
         while (1) {
@@ -639,11 +642,11 @@ sub write {
                 next if $! == EWOULDBLOCK;
                 return;
             }
-
+            
             last if $wrote >= $len;
         }
     }
-
+    
     return $wrote;
 }