Mailing-List: contact new-httpd-help@apache.org; run by ezmlm
Precedence: bulk
Reply-To: new-httpd@apache.org
From: Jim Jagielski <jim@jaguNET.com>
Message-Id: <200009080035.UAA12958@devsys.jaguNET.com>
Subject: Re: cvs commit: apache-2.0/src/main http_core.c
To: new-httpd@apache.org
Date: Thu, 7 Sep 2000 20:35:07 -0400 (EDT)
Reply-To: jim@jaguNET.com
In-Reply-To: <20000907235137.43739.qmail@locus.apache.org> from
 "trawick@locus.apache.org" at Sep 07, 2000 11:51:37 PM
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

This confuses me a bit... The below changes the merge to just happen
if new->add_default_charset != ADD_DEFAULT_CHARSET_UNSET. Well and
good. But the setting of add_default_charset_name shouldn't matter
at all if it _was_ equal to ADD_DEFAULT_CHARSET_UNSET. So limiting
the merge to when it's not equal to ADD_DEFAULT_CHARSET_UNSET shouldn't
effect anything :/ So merging all the time should be OK.

I'm wondering if the bug is simply because we're running into
a situation when Apache shouldn't be adding a default, and the
bug reporter thought it should have. For example, if there is
already a charset parameter, then we don't do a thing. If
not, we only handle things if the cntent type is "text/plain" or
"text/html"...

("it" means add_default_charset)... Most likely, I'm missing
something :)

Did the below actually fix the problem? I can't access the BugDB :/

trawick@locus.apache.org wrote:
> 
> trawick     00/09/07 16:51:37
> 
>   Modified:    src      CHANGES
>                src/main http_core.c
>   Log:
>   Fix merging of AddDefaultCharset directive.
>   PR:		5872 (reported against 1.3)
>   Submitted by:	Jun Kuriyama <kuriyama@imgsrc.co.jp>
>   Reviewed by:	Jeff Trawick
>   
>   Revision  Changes    Path
>   1.215     +3 -0      apache-2.0/src/CHANGES
>   
>   Index: CHANGES
>   ===================================================================
>   RCS file: /home/cvs/apache-2.0/src/CHANGES,v
>   retrieving revision 1.214
>   retrieving revision 1.215
>   diff -u -r1.214 -r1.215
>   --- CHANGES	2000/08/23 23:28:44	1.214
>   +++ CHANGES	2000/09/07 23:51:33	1.215
>   @@ -1,5 +1,8 @@
>    Changes with Apache 2.0a7
>    
>   +  *) Fix merging of AddDefaultCharset directive.
>   +     PR #5872 (1.3) [Jun Kuriyama <kuriyama@imgsrc.co.jp>]
>   +
>      *) Minor revamp of the rlimit sections of code. We now test
>         explicitly for setrlimit and getrlimit. Also, unixd_set_rlimit()
>         is now "available" even if the platform doesn't support
>   
>   
>   
>   1.112     +3 -4      apache-2.0/src/main/http_core.c
>   
>   Index: http_core.c
>   ===================================================================
>   RCS file: /home/cvs/apache-2.0/src/main/http_core.c,v
>   retrieving revision 1.111
>   retrieving revision 1.112
>   diff -u -r1.111 -r1.112
>   --- http_core.c	2000/08/30 01:09:02	1.111
>   +++ http_core.c	2000/09/07 23:51:36	1.112
>   @@ -321,10 +321,9 @@
>    
>        if (new->add_default_charset != ADD_DEFAULT_CHARSET_UNSET) {
>    	conf->add_default_charset = new->add_default_charset;
>   -    }
>   -
>   -    if (new->add_default_charset_name) {
>   -	conf->add_default_charset_name = new->add_default_charset_name;
>   +	if (new->add_default_charset_name) {
>   +	    conf->add_default_charset_name = new->add_default_charset_name;
>   +	}
>        }
>    
>        return (void*)conf;
>   
>   
>   
> 


-- 
===========================================================================
   Jim Jagielski   [|]   jim@jaguNET.com   [|]   http://www.jaguNET.com/
                "Are you suggesting coconuts migrate??"