svn commit: r1844882 - /subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c

[stsp]

Author: stsp
Date: Fri Oct 26 10:01:28 2018
New Revision: 1844882

URL: http://svn.apache.org/viewvc?rev=1844882&view=rev
Log:
Propagate the SVNUseUTF8 option in mod_dav_svn's merge_server_config callback.

Fixes a problem where the SVNUseUTF8 option had no effect in some cases.

* subversion/mod_dav_svn/mod_dav_svn.c
  (merge_server_config): Propagete the value of the use_utf8 config variable.

Patch by: Dmitry Bakshaev <dab18 {at} izhnet ru>

Modified:
    subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c

Modified: subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c?rev=1844882&r1=1844881&r2=1844882&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c Fri Oct 26 10:01:28 
2018
@@ -231,6 +231,9 @@ merge_server_config(apr_pool_t *p, void
       newconf->compression_level = child->compression_level;
     }
 
+  newconf->use_utf8 = INHERIT_VALUE(parent, child, use_utf8);                 
+  svn_utf_initialize2(newconf->use_utf8, p); 
+
   return newconf;
 }