Return-Path: X-Original-To: apmail-subversion-commits-archive@minotaur.apache.org Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 24D151785B for ; Tue, 5 May 2015 04:00:13 +0000 (UTC) Received: (qmail 51254 invoked by uid 500); 5 May 2015 04:00:13 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 51222 invoked by uid 500); 5 May 2015 04:00:13 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 51212 invoked by uid 99); 5 May 2015 04:00:12 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 May 2015 04:00:12 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id CCA09AC010F for ; Tue, 5 May 2015 04:00:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1677737 - in /subversion/branches/1.9.x: ./ STATUS subversion/include/private/svn_subr_private.h subversion/libsvn_ra_local/ra_plugin.c subversion/libsvn_subr/dso.c Date: Tue, 05 May 2015 04:00:12 -0000 To: commits@subversion.apache.org From: svn-role@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150505040012.CCA09AC010F@hades.apache.org> Author: svn-role Date: Tue May 5 04:00:12 2015 New Revision: 1677737 URL: http://svn.apache.org/r1677737 Log: Merge r1677191 from trunk: * r1677191 Fix client pool SEGV with ra-local and --enable-runtime-module-search. Justification: Regression from 1.8.x, just about any ra-local/DSO operation can fail. Votes: +1: philip, brane, rhuijben Modified: subversion/branches/1.9.x/ (props changed) subversion/branches/1.9.x/STATUS subversion/branches/1.9.x/subversion/include/private/svn_subr_private.h subversion/branches/1.9.x/subversion/libsvn_ra_local/ra_plugin.c subversion/branches/1.9.x/subversion/libsvn_subr/dso.c Propchange: subversion/branches/1.9.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue May 5 04:00:12 2015 @@ -91,4 +91,4 @@ /subversion/branches/verify-at-commit:1462039-1462408 /subversion/branches/verify-keep-going:1439280-1546110 /subversion/branches/wc-collate-path:1402685-1480384 -/subversion/trunk:1660545-1660547,1660549-1662901,1663003,1663183-1663184,1663338,1663347,1663355,1663374,1663450,1663530,1663671,1663697,1663706,1663738,1663749,1663791,1663991,1664035,1664078,1664080,1664084-1664085,1664187,1664191,1664193,1664200,1664344,1664476,1664480-1664481,1664483,1664489-1664490,1664507,1664520-1664521,1664523,1664526-1664527,1664531-1664532,1664588,1664593-1664594,1664596,1664653,1664664,1664672,1664674,1664684,1664927,1664938-1664940,1664978,1664984,1664997,1665164,1665195,1665213,1665259,1665318,1665437-1665438,1665609,1665611-1665612,1665845,1665850,1665852,1665886,1665894,1665896,1666096,1666258,1666270,1666272,1666379,1666449,1666690,1666832,1666851,1666965,1667101,1667106-1667107,1667120,1667228,1667233-1667235,1667249-1667250,1667258,1667290,1667301,1667471,1667691-1667693,1667699-1667700,1667715,1667941,1667976,1668320,1668598-1668600,1668602-1668603,1668607-1668608,1668618,1669743,1669746,1669749,1669945,1670139,1670149,1670152,1670329,1670337,167 0347,1670353,1671164,1671388,1672295,1672311,1672372,1672404,1672511-1672512,1672578,1672728,1673044,1673062-1673063,1673065,1673153,1673170,1673172,1673197,1673202,1673204,1673228,1673282,1673445,1673691-1673692,1673746,1673785,1673803,1674015,1674032,1674170,1674406,1674487,1674522,1674580,1674627,1674891,1675771,1676526,1676535,1676555,1676564,1676665,1676769 +/subversion/trunk:1660545-1660547,1660549-1662901,1663003,1663183-1663184,1663338,1663347,1663355,1663374,1663450,1663530,1663671,1663697,1663706,1663738,1663749,1663791,1663991,1664035,1664078,1664080,1664084-1664085,1664187,1664191,1664193,1664200,1664344,1664476,1664480-1664481,1664483,1664489-1664490,1664507,1664520-1664521,1664523,1664526-1664527,1664531-1664532,1664588,1664593-1664594,1664596,1664653,1664664,1664672,1664674,1664684,1664927,1664938-1664940,1664978,1664984,1664997,1665164,1665195,1665213,1665259,1665318,1665437-1665438,1665609,1665611-1665612,1665845,1665850,1665852,1665886,1665894,1665896,1666096,1666258,1666270,1666272,1666379,1666449,1666690,1666832,1666851,1666965,1667101,1667106-1667107,1667120,1667228,1667233-1667235,1667249-1667250,1667258,1667290,1667301,1667471,1667691-1667693,1667699-1667700,1667715,1667941,1667976,1668320,1668598-1668600,1668602-1668603,1668607-1668608,1668618,1669743,1669746,1669749,1669945,1670139,1670149,1670152,1670329,1670337,167 0347,1670353,1671164,1671388,1672295,1672311,1672372,1672404,1672511-1672512,1672578,1672728,1673044,1673062-1673063,1673065,1673153,1673170,1673172,1673197,1673202,1673204,1673228,1673282,1673445,1673691-1673692,1673746,1673785,1673803,1674015,1674032,1674170,1674406,1674487,1674522,1674580,1674627,1674891,1675771,1676526,1676535,1676555,1676564,1676665,1676769,1677191 Modified: subversion/branches/1.9.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/STATUS?rev=1677737&r1=1677736&r2=1677737&view=diff ============================================================================== --- subversion/branches/1.9.x/STATUS (original) +++ subversion/branches/1.9.x/STATUS Tue May 5 04:00:12 2015 @@ -84,13 +84,6 @@ Veto-blocked changes: Approved changes: ================= - * r1677191 - Fix client pool SEGV with ra-local and --enable-runtime-module-search. - Justification: - Regression from 1.8.x, just about any ra-local/DSO operation can fail. - Votes: - +1: philip, brane, rhuijben - * r1674415, r1676538, r1676570 Fix a spurious no-op property changes from 'svn copy --pin-externals'. Justification: Modified: subversion/branches/1.9.x/subversion/include/private/svn_subr_private.h URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/include/private/svn_subr_private.h?rev=1677737&r1=1677736&r2=1677737&view=diff ============================================================================== --- subversion/branches/1.9.x/subversion/include/private/svn_subr_private.h (original) +++ subversion/branches/1.9.x/subversion/include/private/svn_subr_private.h Tue May 5 04:00:12 2015 @@ -681,6 +681,11 @@ svn_boolean_t svn_bit_array__get(svn_bit_array__t *array, apr_size_t idx); +/* Return the global pool used by the DSO loader, this may be NULL if + no DSOs have been loaded. */ +apr_pool_t * +svn_dso__pool(void); + /** @} */ #ifdef __cplusplus Modified: subversion/branches/1.9.x/subversion/libsvn_ra_local/ra_plugin.c URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/libsvn_ra_local/ra_plugin.c?rev=1677737&r1=1677736&r2=1677737&view=diff ============================================================================== --- subversion/branches/1.9.x/subversion/libsvn_ra_local/ra_plugin.c (original) +++ subversion/branches/1.9.x/subversion/libsvn_ra_local/ra_plugin.c Tue May 5 04:00:12 2015 @@ -41,6 +41,7 @@ #include "private/svn_repos_private.h" #include "private/svn_fspath.h" #include "private/svn_atomic.h" +#include "private/svn_subr_private.h" #define APR_WANT_STRFUNC #include @@ -1878,8 +1879,8 @@ svn_ra_local__init(const svn_version_t * SVN_ERR(svn_ver_check_list2(ra_local_version(), checklist, svn_ver_equal)); #ifndef SVN_LIBSVN_CLIENT_LINKS_RA_LOCAL - /* This assumes that POOL was the pool used to load the dso. */ - SVN_ERR(svn_fs_initialize(pool)); + /* This means the library was loaded as a DSO, so use the DSO pool. */ + SVN_ERR(svn_fs_initialize(svn_dso__pool())); #endif *vtable = &ra_local_vtable; Modified: subversion/branches/1.9.x/subversion/libsvn_subr/dso.c URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/libsvn_subr/dso.c?rev=1677737&r1=1677736&r2=1677737&view=diff ============================================================================== --- subversion/branches/1.9.x/subversion/libsvn_subr/dso.c (original) +++ subversion/branches/1.9.x/subversion/libsvn_subr/dso.c Tue May 5 04:00:12 2015 @@ -29,6 +29,7 @@ #include "private/svn_mutex.h" #include "private/svn_atomic.h" +#include "private/svn_subr_private.h" /* A mutex to protect our global pool and cache. */ static svn_mutex__t *dso_mutex = NULL; @@ -123,4 +124,11 @@ svn_dso_load(apr_dso_handle_t **dso, con return SVN_NO_ERROR; } + +apr_pool_t * +svn_dso__pool(void) +{ + return dso_pool; +} + #endif /* APR_HAS_DSO */