[Catalyst-commits] r13158 - in Catalyst-Runtime/5.80/trunk: . lib/Catalyst/Engine

[t0m at dev.catalyst.perl.org]

Author: t0m
Date: 2010-04-13 23:18:19 +0100 (Tue, 13 Apr 2010)
New Revision: 13158

Modified:
   Catalyst-Runtime/5.80/trunk/Changes
   Catalyst-Runtime/5.80/trunk/lib/Catalyst/Engine/HTTP.pm
Log:
Fix RT#49267

Modified: Catalyst-Runtime/5.80/trunk/Changes
===================================================================
--- Catalyst-Runtime/5.80/trunk/Changes	2010-04-13 22:12:13 UTC (rev 13157)
+++ Catalyst-Runtime/5.80/trunk/Changes	2010-04-13 22:18:19 UTC (rev 13158)
@@ -7,6 +7,8 @@
    - Ensure to always cleanup temporary uploaded files in all cases, even
      when exceptions occur during request processing, using HTTP::Body's
      ->cleanup feature. (RT#41442)
+   - Ensure that Catalyst::Engine::HTTP's options hash is defined before
+     dereferencing it. (RT#49267)
 
   New features:
    - Setting __PACKAGE__->config(enable_catalyst_header => 1); in your MyApp.pm

Modified: Catalyst-Runtime/5.80/trunk/lib/Catalyst/Engine/HTTP.pm
===================================================================
--- Catalyst-Runtime/5.80/trunk/lib/Catalyst/Engine/HTTP.pm	2010-04-13 22:12:13 UTC (rev 13157)
+++ Catalyst-Runtime/5.80/trunk/lib/Catalyst/Engine/HTTP.pm	2010-04-13 22:18:19 UTC (rev 13158)
@@ -68,7 +68,8 @@
 
     # Should we keep the connection open?
     my $connection = $c->request->header('Connection');
-    if (   $self->options->{keepalive}
+    if (   $self->options
+        && $self->options->{keepalive}
         && $connection
         && $connection =~ /^keep-alive$/i
     ) {