This is the first commit which appeared to break APR in such a way that code compiled against apr 1.7.1 would be unable to run against apr 1.7.0 binaries.
Thoughts, rjung? Are you willing to revert? This would persist on apr 1.8.x for those interested in this new feature. On Wed, Jul 17, 2019 at 2:04 PM <rj...@apache.org> wrote: > > Author: rjung > Date: Wed Jul 17 19:04:43 2019 > New Revision: 1863234 > > URL: http://svn.apache.org/viewvc?rev=1863234&view=rev > Log: > Add empty stubs for APR pool functions, that are > only needed when APR_POOL_DEBUG is defined, > but can be aor should be called from app code. > > Providing stubs allows the app code to stay the > same when running with or without debugging APR > lib (no need for app recompilation). > > Backport of r1863217 from trunk. > > Modified: > apr/apr/branches/1.7.x/ (props changed) > apr/apr/branches/1.7.x/include/apr_pools.h > apr/apr/branches/1.7.x/memory/unix/apr_pools.c > > Propchange: apr/apr/branches/1.7.x/ > ------------------------------------------------------------------------------ > --- svn:mergeinfo (original) > +++ svn:mergeinfo Wed Jul 17 19:04:43 2019 > @@ -1,4 +1,4 @@ > /apr/apr/branches/1.4.x:1003369,1101301 > -/apr/apr/trunk:733052,739635,741862,741866-741867,741869,741871,745763-745764,746310,747990,748080,748361,748371,748565,748888,748902,748988,749810,760443,767895,775683,782838,783398,783958,784633,784773,788588,789050,793192-793193,794118,794485,795267,799497,800627,809745,809854,810472,811455,813063,821306,829490,831641,832904,835607,888669,892028,892159,892435,892909,896382,896653,899905,901088,902077,902090,908427,910419,910597,917819,917837-917838,923311,923320,925965,929796,930508,931973,932585,951771,960665,960671,979891,983618,989450,990435,1003338,1044440,1044447,1055657,1072165,1078845,1081462,1081495,1082177,1083038,1083242,1084662,1086695,1088023,1089031,1089129,1089438,1099348,1103310,1183683,1183685-1183686,1183688,1183693,1183698,1213382,1235047,1236970,1237078,1237507,1240472,1340286,1340288,1340470,1341193,1341196,1343233,1343243,1367050,1368819,1370494,1372018,1372022,1372093,1372849,1376957,1384764,1389077,1400200,1402868,1405985,1406690,1420106,1420109,1425356,142 > > 8809,1438940,1438957-1438959,1442903,1449568,1456418,1459994,1460179-1460180,1460184,1460241,1460399,1460405,1462738,1462813,1470186,1470348,1475509,1478905,1480067,1481186,1481262,1481265,1484271,1487796,1489517,1496407,1502804,1510354,1516261,1523384,1523479,1523484,1523505,1523521,1523604,1523613,1523615,1523844-1523845,1523853,1524014,1524031,1528797,1528809,1529488,1529495,1529515,1529521,1529668,1530786,1530800,1530988,1531554,1531768,1531884,1532022,1533104,1533111,1533979,1534882,1535027,1535157,1536744,1538171,1539374,1539389,1539455,1539603,1541054,1541061,1541486,1541655,1541666,1541744,1542601,1542779,1543033,1543056,1548575,1550907,1551650,1551659,1558905,1559382,1559873,1559975,1561040,1561260,1561265,1561321,1561347,1561356,1561361,1561394,1561555,1571894,1575509,1578420,1587045,1587063,1587543,1587545,1588878,1588937,1589982,1593611,1593614-1593615,1593680,1594684,1594708,1595549,1597797,1597803,1604590,1604596,1604598,1605104,1610854,1611023,1611107,1611110,1611117, > > 1611120,1611125,1611184,1611193,1611466,1611515,1611517,1625173,1626564,1634615,1642159,1648830,1664406,1664447,1664451,1664471,1664769-1664770,1664775,1664904,1664911,1664958,1666341,1666411,1666458,1666611,1667420-1667421,1667423,1667900-1667901,1667903,1667914-1667916,1667962,1669077,1671292,1671329,1671356,1671386,1671389,1671513-1671514,1671957,1672354,1672366,1672495,1672575,1674566,1675644,1675656,1675668,1675967,1675970,1675982,1676013,1683521,1685929,1696140,1696767,1722547,1722557,1726928,1727020,1727160,1727175,1727199,1728957,1732582,1733451,1733594,1733694,1733706,1733708,1733775,1734816,1736552,1738791,1738925,1750374,1755709,1755740,1755746,1755758,1755954,1761279,1762326,1774712,1774973,1775069,1776994,1776998,1788334,1788337,1788929,1789947,1789998,1790045,1790200,1790296,1790302-1790304,1790330-1790331,1790436,1790439,1790444,1790446,1790488,1790521,1790523,1790569,1790632,1791598,1791718,1791728,1792620-1792622,1792625,1792961,1792963,1794266,1797415,1798105,18053 > > 80,1808039,1808836,1808910,1809649,1810452,1813286,1813330,1814239-1814240,1814326,1814329,1814331,1816527,1816628,1817485,1819857-1819858,1819860-1819861,1819934-1819935,1820080,1820755,1822357,1827534,1832203,1832691,1832985,1834253,1834494,1834541,1836235,1839068,1839493,1839622,1839769,1840372,1841078,1846806,1850087,1850095,1851541-1851542,1854123,1855049,1855347,1855443-1855444,1855839-1855840,1855855,1855864,1855867,1855877,1855949,1856022,1856042-1856043,1856046,1856050,1856063,1856089,1856096,1856178,1856192,1856196,1856756,1858596,1863205 > +/apr/apr/trunk:733052,739635,741862,741866-741867,741869,741871,745763-745764,746310,747990,748080,748361,748371,748565,748888,748902,748988,749810,760443,767895,775683,782838,783398,783958,784633,784773,788588,789050,793192-793193,794118,794485,795267,799497,800627,809745,809854,810472,811455,813063,821306,829490,831641,832904,835607,888669,892028,892159,892435,892909,896382,896653,899905,901088,902077,902090,908427,910419,910597,917819,917837-917838,923311,923320,925965,929796,930508,931973,932585,951771,960665,960671,979891,983618,989450,990435,1003338,1044440,1044447,1055657,1072165,1078845,1081462,1081495,1082177,1083038,1083242,1084662,1086695,1088023,1089031,1089129,1089438,1099348,1103310,1183683,1183685-1183686,1183688,1183693,1183698,1213382,1235047,1236970,1237078,1237507,1240472,1340286,1340288,1340470,1341193,1341196,1343233,1343243,1367050,1368819,1370494,1372018,1372022,1372093,1372849,1376957,1384764,1389077,1400200,1402868,1405985,1406690,1420106,1420109,1425356,142 > > 8809,1438940,1438957-1438959,1442903,1449568,1456418,1459994,1460179-1460180,1460184,1460241,1460399,1460405,1462738,1462813,1470186,1470348,1475509,1478905,1480067,1481186,1481262,1481265,1484271,1487796,1489517,1496407,1502804,1510354,1516261,1523384,1523479,1523484,1523505,1523521,1523604,1523613,1523615,1523844-1523845,1523853,1524014,1524031,1528797,1528809,1529488,1529495,1529515,1529521,1529668,1530786,1530800,1530988,1531554,1531768,1531884,1532022,1533104,1533111,1533979,1534882,1535027,1535157,1536744,1538171,1539374,1539389,1539455,1539603,1541054,1541061,1541486,1541655,1541666,1541744,1542601,1542779,1543033,1543056,1548575,1550907,1551650,1551659,1558905,1559382,1559873,1559975,1561040,1561260,1561265,1561321,1561347,1561356,1561361,1561394,1561555,1571894,1575509,1578420,1587045,1587063,1587543,1587545,1588878,1588937,1589982,1593611,1593614-1593615,1593680,1594684,1594708,1595549,1597797,1597803,1604590,1604596,1604598,1605104,1610854,1611023,1611107,1611110,1611117, > > 1611120,1611125,1611184,1611193,1611466,1611515,1611517,1625173,1626564,1634615,1642159,1648830,1664406,1664447,1664451,1664471,1664769-1664770,1664775,1664904,1664911,1664958,1666341,1666411,1666458,1666611,1667420-1667421,1667423,1667900-1667901,1667903,1667914-1667916,1667962,1669077,1671292,1671329,1671356,1671386,1671389,1671513-1671514,1671957,1672354,1672366,1672495,1672575,1674566,1675644,1675656,1675668,1675967,1675970,1675982,1676013,1683521,1685929,1696140,1696767,1722547,1722557,1726928,1727020,1727160,1727175,1727199,1728957,1732582,1733451,1733594,1733694,1733706,1733708,1733775,1734816,1736552,1738791,1738925,1750374,1755709,1755740,1755746,1755758,1755954,1761279,1762326,1774712,1774973,1775069,1776994,1776998,1788334,1788337,1788929,1789947,1789998,1790045,1790200,1790296,1790302-1790304,1790330-1790331,1790436,1790439,1790444,1790446,1790488,1790521,1790523,1790569,1790632,1791598,1791718,1791728,1792620-1792622,1792625,1792961,1792963,1794266,1797415,1798105,18053 > > 80,1808039,1808836,1808910,1809649,1810452,1813286,1813330,1814239-1814240,1814326,1814329,1814331,1816527,1816628,1817485,1819857-1819858,1819860-1819861,1819934-1819935,1820080,1820755,1822357,1827534,1832203,1832691,1832985,1834253,1834494,1834541,1836235,1839068,1839493,1839622,1839769,1840372,1841078,1846806,1850087,1850095,1851541-1851542,1854123,1855049,1855347,1855443-1855444,1855839-1855840,1855855,1855864,1855867,1855877,1855949,1856022,1856042-1856043,1856046,1856050,1856063,1856089,1856096,1856178,1856192,1856196,1856756,1858596,1863205,1863217 > /apr/apr/trunk/test/testnames.c:1460405 > /httpd/httpd/trunk:1604590 > > Modified: apr/apr/branches/1.7.x/include/apr_pools.h > URL: > http://svn.apache.org/viewvc/apr/apr/branches/1.7.x/include/apr_pools.h?rev=1863234&r1=1863233&r2=1863234&view=diff > ============================================================================== > --- apr/apr/branches/1.7.x/include/apr_pools.h (original) > +++ apr/apr/branches/1.7.x/include/apr_pools.h Wed Jul 17 19:04:43 2019 > @@ -754,11 +754,12 @@ APR_DECLARE(void) apr_pool_cleanup_for_e > * In this case the caller must call apr_pool_join() to indicate this > * guarantee to the APR_POOL_DEBUG code. > * > - * These functions are only implemented when #APR_POOL_DEBUG is set. > + * These functions have an empty implementation if APR is compiled > + * with #APR_POOL_DEBUG not set. > * > * @{ > */ > -#if APR_POOL_DEBUG || defined(DOXYGEN) > + > /** > * Guarantee that a subpool has the same lifetime as the parent. > * @param p The parent pool > @@ -792,20 +793,6 @@ APR_DECLARE(void) apr_pool_lock(apr_pool > > /* @} */ > > -#else /* APR_POOL_DEBUG or DOXYGEN */ > - > -#ifdef apr_pool_join > -#undef apr_pool_join > -#endif > -#define apr_pool_join(a,b) > - > -#ifdef apr_pool_lock > -#undef apr_pool_lock > -#endif > -#define apr_pool_lock(pool, lock) > - > -#endif /* APR_POOL_DEBUG or DOXYGEN */ > - > /** @} */ > > #ifdef __cplusplus > > Modified: apr/apr/branches/1.7.x/memory/unix/apr_pools.c > URL: > http://svn.apache.org/viewvc/apr/apr/branches/1.7.x/memory/unix/apr_pools.c?rev=1863234&r1=1863233&r2=1863234&view=diff > ============================================================================== > --- apr/apr/branches/1.7.x/memory/unix/apr_pools.c (original) > +++ apr/apr/branches/1.7.x/memory/unix/apr_pools.c Wed Jul 17 19:04:43 2019 > @@ -2834,13 +2834,13 @@ static void free_proc_chain(struct proce > } > } > > +#if !APR_POOL_DEBUG > > /* > * Pool creation/destruction stubs, for people who are running > * mixed release/debug enviroments. > */ > > -#if !APR_POOL_DEBUG > APR_DECLARE(void *) apr_palloc_debug(apr_pool_t *pool, apr_size_t size, > const char *file_line) > { > @@ -2890,6 +2890,29 @@ APR_DECLARE(apr_status_t) apr_pool_creat > return apr_pool_create_unmanaged_ex(newpool, abort_fn, allocator); > } > > +/* > + * Other stubs, for people who are running > + * mixed release/debug enviroments. > + */ > + > +APR_DECLARE(void) apr_pool_join(apr_pool_t *p, apr_pool_t *sub) > +{ > +} > + > +APR_DECLARE(apr_pool_t *) apr_pool_find(const void *mem) > +{ > + return NULL; > +} > + > +APR_DECLARE(apr_size_t) apr_pool_num_bytes(apr_pool_t *pool, int recurse) > +{ > + return 0; > +} > + > +APR_DECLARE(void) apr_pool_lock(apr_pool_t *pool, int flag) > +{ > +} > + > #else /* APR_POOL_DEBUG */ > > #undef apr_palloc > >
