* Updated newlinetype.

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/branches/RELEASE_0_12_0@2567 1a406e8e-add9-4483-a2c8-d8cac5b7c224

diff --git a/src/mod_chxj.c b/src/mod_chxj.c
index 7cabf43..e2eb80c 100644 (file)
--- a/src/mod_chxj.c
+++ b/src/mod_chxj.c
@@ -1408,6 +1408,7 @@ chxj_merge_per_dir_config(apr_pool_t *p, void *basev, void *addv)
   mrg->image_cache_limit  = 0;
   mrg->emoji            = NULL;
   mrg->emoji_tail       = NULL;
+  mrg->new_line_type    = NLTYPE_NIL;
 
   mrg->dir = apr_pstrdup(p, add->dir);
 
@@ -1610,6 +1611,15 @@ chxj_merge_per_dir_config(apr_pool_t *p, void *basev, void *addv)
   else {
     mrg->cookie_lazy_mode = 0;
   }
+  if (add->new_line_type) {
+    mrg->new_line_type = add->new_line_type;
+  }
+  else if (base->new_line_type) {
+    mrg->new_line_type = base->new_line_type;
+  }
+  else {
+    mrg->new_line_type = NLTYPE_NIL;
+  }
   return mrg;
 }