ukamnya
/
Redmine-mod-perl-auth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Precompile the regex used to get the project identifier from URI and location.

1.x
Adirelle 2012-04-04 17:09:05 +02:00
parent b2389b2fc9
commit 2f23e20ed0
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Redmine.pm
View File

@ -147,6 +147,7 @@ use Apache2::Access;
use Apache2::ServerRec qw(); use Apache2::ServerRec qw();
use Apache2::RequestRec qw(); use Apache2::RequestRec qw();
use Apache2::RequestUtil qw(); use Apache2::RequestUtil qw();
use Apache2::CmdParms qw();
use Apache2::Const qw(:common :override :cmd_how); use Apache2::Const qw(:common :override :cmd_how);
use Apache2::Log; use Apache2::Log;
use APR::Pool (); use APR::Pool ();
@ -232,6 +233,7 @@ my @directives = (
# Initialize defaults configuration # Initialize defaults configuration
sub DIR_CREATE { sub DIR_CREATE {
my($class, $parms) = @_; my($class, $parms) = @_;
my $identifier_re = "^".quotemeta($parms->path)."/?([^/]+)" if $parms->path;
return bless { return bless {
PermissionQuery => trim(" PermissionQuery => trim("
SELECT permissions FROM users, members, member_roles, roles SELECT permissions FROM users, members, member_roles, roles
@ -242,6 +244,7 @@ sub DIR_CREATE {
AND members.id = member_roles.member_id AND members.id = member_roles.member_id
AND member_roles.role_id = roles.id AND member_roles.role_id = roles.id
"), "),
IdentifierRegex => $identifier_re ? qr{$identifier_re} : undef,
CacheCredsMax => 0, CacheCredsMax => 0,
CacheCredsCount => 0, CacheCredsCount => 0,
CacheCredsMaxAge => 300, CacheCredsMaxAge => 300,
@ -513,8 +516,8 @@ sub get_project_identifier {
my $cfg = get_config($r); my $cfg = get_config($r);
my $identifier = $cfg->{Project}; my $identifier = $cfg->{Project};
unless($identifier) { unless(defined $identifier || !defined $cfg->{IdentifierRegex}) {
($identifier) = $r->uri =~ m{^\Q$r->location\E/*([^/]+)}; ($identifier) = ($r->uri =~ $cfg->{IdentifierRegex});
} }
return $identifier; return $identifier;