Re: cvs commit: httpd-2.0/server core.c request.c

[Barrie Slaymaker]

On Sun, Aug 26, 2001 at 05:10:17AM -0000, [EMAIL PROTECTED] wrote:
>        core_a = ap_get_module_config(a->elt, &core_module);
>        core_b = ap_get_module_config(b->elt, &core_module);
>   -    if (IS_SPECIAL(core_a)) {
>   -   if (!IS_SPECIAL(core_b)) {
>   -       return 1;
>   -   }
>   +
>   +    if (core_a->r < core_b->r) {
>   +        return -1;
>        }
>   -    else if (IS_SPECIAL(core_b)) {
>   -   return -1;
>   +    else if (core_a->r > core_b->r) {
>   +        return 1;
>        }

Does this bit mean that regex-based sections won't run in config-file
order, but in order of their positions in the heap?

>   -    else {
>   -   /* we know they're both not special */
>   -   if (core_a->d_components < core_b->d_components) {
>   -       return -1;
>   -   }
>   -   else if (core_a->d_components > core_b->d_components) {
>   -       return 1;
>   -   }
>   +    if (core_a->d_components < core_b->d_components) {
>   +        return -1;
>   +    }
>   +    else if (core_a->d_components > core_b->d_components) {
>   +        return 1;
>        }
>   -    /* Either they're both special, or they're both not special and have the
>   -     * same number of components.  In any event, we now have to compare
>   -     * the minor key. */
>   +    /* They have the same number of components, we now have to compare
>   +     * the minor key to maintain the original order. 
>   +     */
>        return a->orig_index - b->orig_index;
>    }