You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sv...@apache.org on 2018/11/03 04:00:19 UTC
svn commit: r1845640 - in /subversion/branches/1.11.x: ./ STATUS
subversion/mod_dav_svn/mod_dav_svn.c
Author: svn-role
Date: Sat Nov 3 04:00:19 2018
New Revision: 1845640
URL: http://svn.apache.org/viewvc?rev=1845640&view=rev
Log:
Merge r1844882 from trunk:
* r1844882
Fix propagation of mod_dav_svn's SVNUseUTF8 configuration setting.
Justification:
The option has no effect in some setups. User submitted the patch.
Votes:
+1: stsp, brane, rhuijben
Modified:
subversion/branches/1.11.x/ (props changed)
subversion/branches/1.11.x/STATUS
subversion/branches/1.11.x/subversion/mod_dav_svn/mod_dav_svn.c
Propchange: subversion/branches/1.11.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 3 04:00:19 2018
@@ -100,4 +100,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1840990-1840991,1840995,1840997,1841059,1841079,1841091,1841098,1841136,1841180,1841272,1841481,1841524-1841525,1841567,1841600-1841602,1841606,1841719,1841725,1841731,1841736,1841742-1841743,1841753-1841754,1841822,1841850,1841867,1842090,1842222-1842223,1842334,1842814,1842827,1842829,1842877,1843888
+/subversion/trunk:1840990-1840991,1840995,1840997,1841059,1841079,1841091,1841098,1841136,1841180,1841272,1841481,1841524-1841525,1841567,1841600-1841602,1841606,1841719,1841725,1841731,1841736,1841742-1841743,1841753-1841754,1841822,1841850,1841867,1842090,1842222-1842223,1842334,1842814,1842827,1842829,1842877,1843888,1844882
Modified: subversion/branches/1.11.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.11.x/STATUS?rev=1845640&r1=1845639&r2=1845640&view=diff
==============================================================================
--- subversion/branches/1.11.x/STATUS (original)
+++ subversion/branches/1.11.x/STATUS Sat Nov 3 04:00:19 2018
@@ -43,13 +43,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1844882
- Fix propagation of mod_dav_svn's SVNUseUTF8 configuration setting.
- Justification:
- The option has no effect in some setups. User submitted the patch.
- Votes:
- +1: stsp, brane, rhuijben
-
* r1845204
Fix issue SVN-4782: Do not use (const char*)1 in httpd modules as value for
r->notes.
Modified: subversion/branches/1.11.x/subversion/mod_dav_svn/mod_dav_svn.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.11.x/subversion/mod_dav_svn/mod_dav_svn.c?rev=1845640&r1=1845639&r2=1845640&view=diff
==============================================================================
--- subversion/branches/1.11.x/subversion/mod_dav_svn/mod_dav_svn.c (original)
+++ subversion/branches/1.11.x/subversion/mod_dav_svn/mod_dav_svn.c Sat Nov 3 04:00:19 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;
}