From: Florian Ragwitz <rafl@debian.org>
Date: Sat, 22 Aug 2009 16:12:25 +0000 (+0000)
Subject: Allow turning off the httponly option (Closes RT#48930).
X-Git-Tag: v0.14~3
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Plugin-Session-State-Cookie.git;a=commitdiff_plain;h=3c6b745109624dae69d5de98cac74f09a9889e4b

Allow turning off the httponly option (Closes RT#48930).
---

diff --git a/Changes b/Changes
index 0e86672..fd90259 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,7 @@
 Revision history for Perl extension Catalyst::Plugin::Session::State::Cookie
 
+        - Allow turning off the httponly option (Closes RT#48930).
+
 0.13    2009-08-19
         - Remove Test::MockObject from the test suite as prone to failing on
           some platforms and perl versions due to its UNIVERSAL:: package
@@ -10,7 +12,7 @@ Revision history for Perl extension Catalyst::Plugin::Session::State::Cookie
           replace_constructor at scope end handling.
 
 0.12    2009-07-18
-        - Introduced a new option cookie_httponly 
+        - Introduced a new option cookie_httponly
         - Option cookie_secure extended (old syntax fully supported)
 
 0.11    2009-05-13
@@ -22,7 +24,7 @@ Revision history for Perl extension Catalyst::Plugin::Session::State::Cookie
         - Switch from NEXT to MRO::Compat
 
 0.09    2007-10-08
-        - Bump dependencies so that streaming a file also causes the cookie to 
+        - Bump dependencies so that streaming a file also causes the cookie to
           be updated.
           - Add tests for this
 
@@ -43,7 +45,7 @@ Revision history for Perl extension Catalyst::Plugin::Session::State::Cookie
 0.04
         - Depend on a higher version of C::P::Session
 
-0.03 
+0.03
         - refactored make_session_cookie to separate calc_expiry, and made
 	      that easily overloadable.
         - updated for the new state API (get_session_id, set_session_id, etc)
diff --git a/lib/Catalyst/Plugin/Session/State/Cookie.pm b/lib/Catalyst/Plugin/Session/State/Cookie.pm
index d71e059..0c26490 100644
--- a/lib/Catalyst/Plugin/Session/State/Cookie.pm
+++ b/lib/Catalyst/Plugin/Session/State/Cookie.pm
@@ -77,8 +77,8 @@ sub make_session_cookie {
     $cookie->{secure} = 1 unless ( ($sec==0) || ($sec==2) );
     $cookie->{secure} = 1 if ( ($sec==2) && $c->req->secure );
 
-    my $hto = $cookie->{httponly} || 1; # default = 1 (set httponly)
-    $cookie->{httponly} = 1 unless ($hto==0);
+    $cookie->{httponly} = 1
+        unless exists $cookie->{httponly}; # default = 1 (set httponly)
 
     return $cookie;
 }