Mailing-List: contact dev-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Date: Mon, 27 Aug 2001 04:22:53 -0400
From: Barrie Slaymaker <barries@slaysys.com>
To: dev@httpd.apache.org
Subject: Re: cvs commit: httpd-2.0/server core.c request.c
Message-ID: <20010827042253.C16703@jester.slaysys.com>
References: <20010826051017.40500.qmail@icarus.apache.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.2.5i
In-Reply-To: <20010826051017.40500.qmail@icarus.apache.org>;
 from wrowe@apache.org on Sun, Aug 26, 2001 at 05:10:17AM -0000
Status: O

On Sun, Aug 26, 2001 at 05:10:17AM -0000, wrowe@apache.org 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;
>    }