From: Jeff Trawick <trawick@apache.org>
Date: Thu, 7 Sep 2000 23:51:36 +0000 (+0000)
Subject: Fix merging of AddDefaultCharset directive.
X-Git-Tag: APACHE_2_0_ALPHA_7~201
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3b64d1dfdff388295644daa239e51058035117ae;p=thirdparty%2Fapache%2Fhttpd.git

Fix merging of AddDefaultCharset directive.
PR:		5872 (reported against 1.3)
Submitted by:	Jun Kuriyama <kuriyama@imgsrc.co.jp>
Reviewed by:	Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86176 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/http/http_core.c b/modules/http/http_core.c
index 041f5f86331..43b87336d7f 100644
--- a/modules/http/http_core.c
+++ b/modules/http/http_core.c
@@ -321,10 +321,9 @@ static void *merge_core_dir_configs(apr_pool_t *a, void *basev, void *newv)
 
     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;