Author: hwright Date: Fri Jul 29 15:19:21 2011 New Revision: 1152260 URL: http://svn.apache.org/viewvc?rev=1152260&view=rev Log: Merge r1152129 from trunk:
* r1152129 Plug a memory leak. Justification: Use the APR API properly. Resolves a valgrind warning. Votes: +1: danielsh, stsp, rhuijben Modified: subversion/branches/1.7.x/ (props changed) subversion/branches/1.7.x/STATUS subversion/branches/1.7.x/subversion/libsvn_subr/svn_cache_config.c Propchange: subversion/branches/1.7.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Jul 29 15:19:21 2011 @@ -54,4 +54,4 @@ /subversion/branches/tree-conflicts:868291-873154 /subversion/branches/tree-conflicts-notify:873926-874008 /subversion/branches/uris-as-urls:1060426-1064427 -/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149572,1149675,1149701,1149713,1150372,1151036 +/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149572,1149675,1149701,1149713,1150372,1151036,1152129 Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1152260&r1=1152259&r2=1152260&view=diff ============================================================================== --- subversion/branches/1.7.x/STATUS (original) +++ subversion/branches/1.7.x/STATUS Fri Jul 29 15:19:21 2011 @@ -226,10 +226,3 @@ Approved changes: A regression from 1.6. Votes: +1: philip, stsp, danielsh - - * r1152129 - Plug a memory leak. - Justification: - Use the APR API properly. Resolves a valgrind warning. - Votes: - +1: danielsh, stsp, rhuijben Modified: subversion/branches/1.7.x/subversion/libsvn_subr/svn_cache_config.c URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_subr/svn_cache_config.c?rev=1152260&r1=1152259&r2=1152260&view=diff ============================================================================== --- subversion/branches/1.7.x/subversion/libsvn_subr/svn_cache_config.c (original) +++ subversion/branches/1.7.x/subversion/libsvn_subr/svn_cache_config.c Fri Jul 29 15:19:21 2011 @@ -113,6 +113,7 @@ svn_cache__get_global_membuffer_cache(vo apr_pool_create_ex(&pool, NULL, NULL, allocator); if (pool == NULL) return NULL; + apr_allocator_owner_set(allocator, pool); err = svn_cache__membuffer_cache_create( &new_cache,