Roxen.git/ server/ base_server/ configuration.pike

2016-01-28

2016-01-28 10:25:26 by 0

• dd2f0a0d9fed1e653632664534b5b65c827963a0 (11 lines) (+9/-2) ^{[ Show | Annotate ]}
  Branch: dd2f0a0d9fed1e653632664534b5b65c827963a0

Fix regression in location_modules() where entries with same priority weren't
returned in order of decreasing prefix length.

976:    foreach(low_module_lookup(MODULE_LOCATION), RoxenModule me) {    int pri = me->query("_priority");    if (pri != prev_pri) { -  sort(level_locations, level_find_files); +  // Order after longest prefix length +  sort(map(level_locations, +  lambda(string loc) { return -sizeof(loc); }), +  level_locations, level_find_files);    foreach(level_locations; int i; string path) {    new_location_module_cache += ({ ({ path, level_find_files[i] }) });    }
990:    level_find_files += ({ me->find_file });    level_locations += ({ location });    } -  sort(level_locations, level_find_files); +  +  sort(map(level_locations, +  lambda(string loc) { return -sizeof(loc); }), +  level_locations, level_find_files);    foreach(level_locations; int i; string path) {    new_location_module_cache += ({ ({ path, level_find_files[i] }) });    }