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/02 04:00:14 UTC
svn commit: r1845533 - in /subversion/branches/1.10.x: ./ STATUS
subversion/mod_dav_svn/mod_dav_svn.c
Author: svn-role
Date: Fri Nov 2 04:00:13 2018
New Revision: 1845533
URL: http://svn.apache.org/viewvc?rev=1845533&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.10.x/ (props changed)
subversion/branches/1.10.x/STATUS
subversion/branches/1.10.x/subversion/mod_dav_svn/mod_dav_svn.c
Propchange: subversion/branches/1.10.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 2 04:00:13 2018
@@ -102,4 +102,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1817837,1817856,1818577-1818578,1818584,1818651,1818662,1818727,1818801,1818803,1818807,1818868,1818871,1819036-1819037,1819043,1819049,1819052,1819093,1819146,1819162,1819444,1819556-1819557,1819603,1819804,1819911,1820044,1820046-1820047,1820518,1820627,1820718,1820778,1821183,1821224,1821621,1821678,1822401,1822587,1822591,1822996,1823202-1823203,1823211,1823327,1823791,1823966,1823989,1824033,1825024,1825045,1825215,1825266,1825306,1825709,1825711,1825721,1825736,1825778,1825783,1825787-1825788,1825979,1826720-1826721,1826747,1826811,1826814,1826877,1826907,1826971,1827105,1827114,1827191,1827562,1827574,1827670,1828613,1829012,1829015,1829241,1829260,1829344,1830083,1830882-1830883,1830885,1830900-1830901,1831110,1831112,1831540,1833465,1833621,1833836,1833842,1833864,1833866,1833895,1833897,1833899,1833901,1835760,1836306,1836762,1836802,1836960,1836963,1836968,1836976,1837037,1837790,1838813,1839662,1839703,1839734,1839739,1840991,1842260,1842262,1842264
+/subversion/trunk:1817837,1817856,1818577-1818578,1818584,1818651,1818662,1818727,1818801,1818803,1818807,1818868,1818871,1819036-1819037,1819043,1819049,1819052,1819093,1819146,1819162,1819444,1819556-1819557,1819603,1819804,1819911,1820044,1820046-1820047,1820518,1820627,1820718,1820778,1821183,1821224,1821621,1821678,1822401,1822587,1822591,1822996,1823202-1823203,1823211,1823327,1823791,1823966,1823989,1824033,1825024,1825045,1825215,1825266,1825306,1825709,1825711,1825721,1825736,1825778,1825783,1825787-1825788,1825979,1826720-1826721,1826747,1826811,1826814,1826877,1826907,1826971,1827105,1827114,1827191,1827562,1827574,1827670,1828613,1829012,1829015,1829241,1829260,1829344,1830083,1830882-1830883,1830885,1830900-1830901,1831110,1831112,1831540,1833465,1833621,1833836,1833842,1833864,1833866,1833895,1833897,1833899,1833901,1835760,1836306,1836762,1836802,1836960,1836963,1836968,1836976,1837037,1837790,1838813,1839662,1839703,1839734,1839739,1840991,1842260,1842262,1842264,184
4882
Modified: subversion/branches/1.10.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1845533&r1=1845532&r2=1845533&view=diff
==============================================================================
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Fri Nov 2 04:00:13 2018
@@ -42,13 +42,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.10.x/subversion/mod_dav_svn/mod_dav_svn.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/mod_dav_svn/mod_dav_svn.c?rev=1845533&r1=1845532&r2=1845533&view=diff
==============================================================================
--- subversion/branches/1.10.x/subversion/mod_dav_svn/mod_dav_svn.c (original)
+++ subversion/branches/1.10.x/subversion/mod_dav_svn/mod_dav_svn.c Fri Nov 2 04:00:13 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;
}