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:16 UTC
svn commit: r1845534 - in /subversion/branches/1.10.x: ./ STATUS
subversion/mod_authz_svn/mod_authz_svn.c subversion/mod_dav_svn/mod_dav_svn.c
Author: svn-role
Date: Fri Nov 2 04:00:15 2018
New Revision: 1845534
URL: http://svn.apache.org/viewvc?rev=1845534&view=rev
Log:
Merge r1845204 from trunk:
* r1845204
Fix issue SVN-4782: Do not use (const char*)1 in httpd modules as value for
r->notes.
Justification:
Prevents a crash in mod_http2.
Votes:
+1: danielsh, brane, rhuijben
+1 (non-binding): rpluem
Modified:
subversion/branches/1.10.x/ (props changed)
subversion/branches/1.10.x/STATUS
subversion/branches/1.10.x/subversion/mod_authz_svn/mod_authz_svn.c
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:15 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,184
4882
+/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,1845204
Modified: subversion/branches/1.10.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1845534&r1=1845533&r2=1845534&view=diff
==============================================================================
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Fri Nov 2 04:00:15 2018
@@ -42,15 +42,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1845204
- Fix issue SVN-4782: Do not use (const char*)1 in httpd modules as value for
- r->notes.
- Justification:
- Prevents a crash in mod_http2.
- Votes:
- +1: danielsh, brane, rhuijben
- +1 (non-binding): rpluem
-
* r1845261
svndumpfilter: Include node path in error messages.
Justification:
Modified: subversion/branches/1.10.x/subversion/mod_authz_svn/mod_authz_svn.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/mod_authz_svn/mod_authz_svn.c?rev=1845534&r1=1845533&r2=1845534&view=diff
==============================================================================
--- subversion/branches/1.10.x/subversion/mod_authz_svn/mod_authz_svn.c (original)
+++ subversion/branches/1.10.x/subversion/mod_authz_svn/mod_authz_svn.c Fri Nov 2 04:00:15 2018
@@ -912,7 +912,7 @@ access_checker(request_rec *r)
{
/* Set the note to force authn regardless of what access_checker_ex
hook requires */
- apr_table_setn(r->notes, FORCE_AUTHN_NOTE, (const char*)1);
+ apr_table_setn(r->notes, FORCE_AUTHN_NOTE, "1");
/* provide the proper return so the access_checker hook doesn't
* prevent the code from continuing on to the other auth hooks */
@@ -978,7 +978,7 @@ access_checker(request_rec *r)
* ap_some_authn_rquired() without triggering an infinite
* loop since the call will trigger this function to be
* called again. */
- apr_table_setn(r->notes, IN_SOME_AUTHN_NOTE, (const char*)1);
+ apr_table_setn(r->notes, IN_SOME_AUTHN_NOTE, "1");
authn_required = ap_some_authn_required(r);
apr_table_unset(r->notes, IN_SOME_AUTHN_NOTE);
if (authn_required)
@@ -1021,7 +1021,7 @@ check_user_id(request_rec *r)
status = req_check_access(r, conf, &repos_path, &dest_repos_path);
if (status == OK)
{
- apr_table_setn(r->notes, "authz_svn-anon-ok", (const char*)1);
+ apr_table_setn(r->notes, "authz_svn-anon-ok", "1");
log_access_verdict(APLOG_MARK, r, 1, FALSE, repos_path, dest_repos_path);
return OK;
}
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=1845534&r1=1845533&r2=1845534&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:15 2018
@@ -1258,7 +1258,7 @@ static int dav_svn__translate_name(reque
/* Leave a note to ourselves so that we know not to decline in the
* map_to_storage hook. */
- apr_table_setn(r->notes, NO_MAP_TO_STORAGE_NOTE, (const char*)1);
+ apr_table_setn(r->notes, NO_MAP_TO_STORAGE_NOTE, "1");
return OK;
}