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 041f5f863316b453da022f05f904f71a5762a166..43b87336d7fbeb7624c3066054114c6f696aa0c4 100644 (file)
--- 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;