X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst%2FPlugin%2FStatic%2FSimple.pm;h=fedd30901e9c42625db5fc5a85ce738d90d7cd3a;hp=827c2725f1feeec72dd6c053129f199d248af384;hb=0db142210599031ba4944a0b02d6dba07475a9e5;hpb=d10c3e60742117af15697a420e0cb37850bba8d7 diff --git a/lib/Catalyst/Plugin/Static/Simple.pm b/lib/Catalyst/Plugin/Static/Simple.pm index 827c272..fedd309 100644 --- a/lib/Catalyst/Plugin/Static/Simple.pm +++ b/lib/Catalyst/Plugin/Static/Simple.pm @@ -9,7 +9,7 @@ use IO::File; use MIME::Types; use NEXT; -our $VERSION = '0.12'; +our $VERSION = '0.13'; __PACKAGE__->mk_classdata( qw/_static_mime_types/ ); __PACKAGE__->mk_accessors( qw/_static_file @@ -130,13 +130,13 @@ sub _locate_static_file { next DIR_CHECK; } } else { - $dir =~ s/\/$//xms; + $dir =~ s/(\/|\\)$//xms; if ( -d $dir && -f $dir . '/' . $path ) { # do we need to ignore the file? for my $ignore ( @{ $c->config->{static}->{ignore_dirs} } ) { - $ignore =~ s{/$}{}; - if ( $path =~ /^$ignore\// ) { + $ignore =~ s{(/|\\)$}{}; + if ( $path =~ /^$ignore(\/|\\)/ ) { $c->_debug_msg( "Ignoring directory `$ignore`" ) if ( $c->config->{static}->{debug} ); next DIR_CHECK;