aboutsummaryrefslogtreecommitdiffstats
path: root/perllib/Catalyst/Plugin
diff options
context:
space:
mode:
authorMarius Halden <marius.h@lden.org>2015-11-16 11:15:10 +0100
committerMarius Halden <marius.h@lden.org>2015-11-16 11:15:10 +0100
commit1339a64632c441e4d7858bd5946738c9840c624d (patch)
tree0b1393ca9af05d1af690fbf6c569c195f4136e4c /perllib/Catalyst/Plugin
parent17cc40a8a2387669984ae4a36bb0d30d889d1a07 (diff)
parent4fb5331abd2fa4c89ebeb89bc92a245fadd0aa19 (diff)
Merge branch 'fiksgatami-dev' into fiksgatami-prod
Oppgrader prod til 1.7
Diffstat (limited to 'perllib/Catalyst/Plugin')
-rw-r--r--perllib/Catalyst/Plugin/Session/State/Cookie.pm3
1 files changed, 3 insertions, 0 deletions
diff --git a/perllib/Catalyst/Plugin/Session/State/Cookie.pm b/perllib/Catalyst/Plugin/Session/State/Cookie.pm
index e0a651ed9..bef0c1e66 100644
--- a/perllib/Catalyst/Plugin/Session/State/Cookie.pm
+++ b/perllib/Catalyst/Plugin/Session/State/Cookie.pm
@@ -50,6 +50,9 @@ sub update_session_cookie {
sub cookie_is_rejecting {
my ( $c, $cookie ) = @_;
+ # Prevent infinite loop in request->path. mySociety addition
+ return 0 if $c->request->has_uri && !$c->request->_has_path;
+
# Don't output cookie for JS or JPEG files. mySociety addition
return 1 if substr($c->request->path, -3) eq '.js'
|| substr($c->request->path, -5) eq '.jpeg';