Correct bad args order for lmLog

This commit is contained in:
Xavier Guimard 2013-09-12 04:31:14 +00:00
parent 48b1c6af80
commit eed6318879
2 changed files with 8 additions and 7 deletions

View File

@ -1509,8 +1509,9 @@ sub grant {
my ( $class, $uri ) = splice @_; my ( $class, $uri ) = splice @_;
for ( my $i = 0 ; $i < $locationCount ; $i++ ) { for ( my $i = 0 ; $i < $locationCount ; $i++ ) {
if ( $uri =~ $locationRegexp->[$i] ) { if ( $uri =~ $locationRegexp->[$i] ) {
$class->lmLog( 'debug', $class->lmLog(
'Regexp "' . $locationConditionText->[$i] . '" match' ); 'Regexp "' . $locationConditionText->[$i] . '" match',
'debug' );
return &{ $locationCondition->[$i] }($datas); return &{ $locationCondition->[$i] }($datas);
} }
} }

View File

@ -175,10 +175,10 @@ sub grant {
my $vhost = $apacheRequest->hostname; my $vhost = $apacheRequest->hostname;
for ( my $i = 0 ; $i < $locationCount->{$vhost} ; $i++ ) { for ( my $i = 0 ; $i < $locationCount->{$vhost} ; $i++ ) {
if ( $uri =~ $locationRegexp->{$vhost}->[$i] ) { if ( $uri =~ $locationRegexp->{$vhost}->[$i] ) {
$class->lmLog( 'debug', $class->lmLog(
'Regexp "' 'Regexp "' . $locationConditionText->{$vhost}->[$i] . '" match',
. $locationConditionText->{$vhost}->[$i] 'debug'
. '" match' ); );
return &{ $locationCondition->{$vhost}->[$i] }($datas); return &{ $locationCondition->{$vhost}->[$i] }($datas);
} }
} }
@ -189,7 +189,7 @@ sub grant {
); );
return 0; return 0;
} }
$class->lmLog( 'debug', "$vhost: Apply default rule" ); $class->lmLog( "$vhost: Apply default rule", 'debug' );
return &{ $defaultCondition->{$vhost} }($datas); return &{ $defaultCondition->{$vhost} }($datas);
} }