httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "William A. Rowe, Jr." <wr...@rowe-clan.net>
Subject Re: Tag time?
Date Wed, 19 Sep 2001 18:19:10 GMT
This patch is broken.  The reason is pretty simple...

we are constructing a merge-product that consists of only the <loc>
blocks.  We cannot merge to the server root till the bitter end,
so that if a request 'switches' vhosts, we simply remerge this end
result with the 'other' vhost's per_dir_config.

Still looking :(  At least I have this afternoon to fight it.

Bill

----- Original Message ----- 
From: "Doug MacEachern" <dougm@covalent.net>
To: <dev@httpd.apache.org>
Sent: Sunday, September 16, 2001 5:45 PM
Subject: RE: Tag time?


> On Sun, 16 Sep 2001, Sander Striker wrote:
>  
> > Well, there is at least the dir-merge segv which is more generic
> > than just mod_ssl.  Doug posted a minimal repro recipe a few days
> > back.
> 
> following patch cures.  all httpd-test and modperl-2.0 tests pass.
> not sure if this is the "right" fix however, would like to hear
> from somebody more familar with this area of the code..
> 
> Index: server/request.c
> ===================================================================
> RCS file: /home/cvs/httpd-2.0/server/request.c,v
> retrieving revision 1.50
> diff -u -r1.50 request.c
> --- server/request.c 2001/09/06 17:58:28 1.50
> +++ server/request.c 2001/09/16 22:31:19
> @@ -1232,10 +1232,14 @@
>                  matches = 0;
>              }
>  
> -            if (now_merged)
> +            if (now_merged) {
> +                now_merged = ap_merge_per_dir_configs(r->pool,
> +                                                      r->per_dir_config,
> +                                                      now_merged);
>           now_merged = ap_merge_per_dir_configs(r->pool, 
>                                                        now_merged,
>                                                        locations[j]);
> +            }
>              else
>                  now_merged = locations[j];
>  
> 
> 


Mime
View raw message