httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Jun Kuriyama <kuriy...@imgsrc.co.jp>
Subject [patch] AddDefaultCharset (PR#5872)
Date Tue, 05 Sep 2000 13:06:57 GMT

As reported in PR#5872, it seems current (1.3.x, 2.0 in CVS)
implementation of AddDefaultCharset directive has a problem.

On processing merge_core_dir_configs() in http_core.c, this function
checks "if (new->add_default_charset_name)" to merge
add_default_charset_name.  But new->add_default_charset_name is always
(at least I checked around it...) set to the pointer of "iso-8859-1"
in create_core_dir_config().  So though new->add_default_charset is
ADD_DEFAULT_CHARSET_UNSET, new->add_default_charset_name is
overwritten.

I don't know why PR#5872 is proccessed in 1.3.x repository, but I
think this should be fixed both in 1.3.x and 2.0.


Index: http_core.c
===================================================================
RCS file: /home/acvs/apache-2.0/src/main/http_core.c,v
retrieving revision 1.111
diff -u -u -r1.111 http_core.c
--- http_core.c	2000/08/30 01:09:02	1.111
+++ http_core.c	2000/09/05 12:52:41
@@ -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;

-- 
Jun Kuriyama <kuriyama@imgsrc.co.jp> // IMG SRC, Inc.
             <kuriyama@FreeBSD.org> // FreeBSD Project

Mime
View raw message