apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fua...@apache.org
Subject svn commit: r1479836 - in /apr/apr/trunk: crypto/apr_crypto.c dbd/apr_dbd.c dbm/apr_dbm.c util-misc/apu_dso.c
Date Tue, 07 May 2013 10:05:07 GMT
Author: fuankg
Date: Tue May  7 10:05:07 2013
New Revision: 1479836

URL: http://svn.apache.org/r1479836
Log:
Fix forever loop on NetWare when trying to get parent pool.

Modified:
    apr/apr/trunk/crypto/apr_crypto.c
    apr/apr/trunk/dbd/apr_dbd.c
    apr/apr/trunk/dbm/apr_dbm.c
    apr/apr/trunk/util-misc/apu_dso.c

Modified: apr/apr/trunk/crypto/apr_crypto.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/crypto/apr_crypto.c?rev=1479836&r1=1479835&r2=1479836&view=diff
==============================================================================
--- apr/apr/trunk/crypto/apr_crypto.c (original)
+++ apr/apr/trunk/crypto/apr_crypto.c Tue May  7 10:05:07 2013
@@ -94,7 +94,9 @@ APR_DECLARE(apr_status_t) apr_crypto_ini
     }
 
     /* Top level pool scope, need process-scope lifetime */
-    for (parent = pool; parent; parent = apr_pool_parent_get(pool))
+    for (parent = apr_pool_parent_get(pool);
+         parent && parent != pool;
+         parent = apr_pool_parent_get(pool))
         pool = parent;
 #if APR_HAVE_MODULAR_DSO
     /* deprecate in 2.0 - permit implicit initialization */

Modified: apr/apr/trunk/dbd/apr_dbd.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbd/apr_dbd.c?rev=1479836&r1=1479835&r2=1479836&view=diff
==============================================================================
--- apr/apr/trunk/dbd/apr_dbd.c (original)
+++ apr/apr/trunk/dbd/apr_dbd.c Tue May  7 10:05:07 2013
@@ -101,8 +101,10 @@ APR_DECLARE(apr_status_t) apr_dbd_init(a
     }
 
     /* Top level pool scope, need process-scope lifetime */
-    for (parent = pool;  parent; parent = apr_pool_parent_get(pool))
-         pool = parent;
+    for (parent = apr_pool_parent_get(pool);
+        parent && parent != pool;
+        parent = apr_pool_parent_get(pool))
+       pool = parent;
 #if APR_HAVE_MODULAR_DSO
     /* deprecate in 2.0 - permit implicit initialization */
     apu_dso_init(pool);

Modified: apr/apr/trunk/dbm/apr_dbm.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbm/apr_dbm.c?rev=1479836&r1=1479835&r2=1479836&view=diff
==============================================================================
--- apr/apr/trunk/dbm/apr_dbm.c (original)
+++ apr/apr/trunk/dbm/apr_dbm.c Tue May  7 10:05:07 2013
@@ -129,8 +129,10 @@ static apr_status_t dbm_open_type(apr_db
         apr_pool_t *parent;
 
         /* Top level pool scope, need process-scope lifetime */
-        for (parent = pool;  parent; parent = apr_pool_parent_get(pool))
-             pool = parent;
+        for (parent = apr_pool_parent_get(pool);
+             parent && parent != pool;
+             parent = apr_pool_parent_get(pool))
+            pool = parent;
 
         /* deprecate in 2.0 - permit implicit initialization */
         apu_dso_init(pool);

Modified: apr/apr/trunk/util-misc/apu_dso.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/util-misc/apu_dso.c?rev=1479836&r1=1479835&r2=1479836&view=diff
==============================================================================
--- apr/apr/trunk/util-misc/apu_dso.c (original)
+++ apr/apr/trunk/util-misc/apu_dso.c Tue May  7 10:05:07 2013
@@ -86,8 +86,10 @@ apr_status_t apu_dso_init(apr_pool_t *po
     }
 
     /* Top level pool scope, need process-scope lifetime */
-    for (parent = global = pool; parent; parent = apr_pool_parent_get(global))
-        global = parent;
+    for (parent = apr_pool_parent_get(pool);
+         parent && parent != pool;
+         parent = apr_pool_parent_get(pool))
+        pool = parent;
 
     dsos = apr_hash_make(global);
 



Mime
View raw message