* Rules sorted in Handler (to prepare sorting with regexp comments)

* debian/control mistake
This commit is contained in:
Xavier Guimard 2009-06-09 05:29:39 +00:00
parent e55a4868d3
commit cb10ec49c1
3 changed files with 4 additions and 5 deletions

View File

@ -42,12 +42,11 @@ Package: liblemonldap-ng-conf-perl
Architecture: all
Depends: ${misc:Depends}, libdbi-perl, debconf, libcache-cache-perl, libregexp-assemble-perl, libcrypt-rijndael-perl
Recommends: libsoap-lite-perl
Description: Lemonldap::NG administration interface part
Description: Lemonldap::NG common files
Lemonldap::NG is a complete Web-SSO system that can run with reverse-proxies
or directly on application Apache servers.
.
This package installs the configuration libraries used by other Lemonldap::NG
modules.
This package installs common files used by other Lemonldap::NG modules.
Package: liblemonldap-ng-manager-perl
Architecture: all

View File

@ -471,7 +471,7 @@ sub locationRulesInit {
$locationCount = 0;
# Pre compilation : both regexp and conditions
foreach ( keys %{ $args->{locationRules} } ) {
foreach ( keys sort %{ $args->{locationRules} } ) {
if ( $_ eq 'default' ) {
$defaultCondition =
$class->conditionSub( $args->{locationRules}->{$_} );

View File

@ -27,7 +27,7 @@ sub locationRulesInit {
my ( $class, $args ) = @_;
foreach my $vhost ( keys %{ $args->{locationRules} } ) {
$locationCount->{$vhost} = 0;
foreach ( keys %{ $args->{locationRules}->{$vhost} } ) {
foreach ( sort keys %{ $args->{locationRules}->{$vhost} } ) {
if ( $_ eq 'default' ) {
$defaultCondition->{$vhost} =
$class->conditionSub(