apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bo...@apache.org
Subject svn commit: r675817 - in /apr/apr-util/branches/1.3.x: CHANGES misc/apu_dso.c
Date Fri, 11 Jul 2008 00:25:48 GMT
Author: bojan
Date: Thu Jul 10 17:25:47 2008
New Revision: 675817

URL: http://svn.apache.org/viewvc?rev=675817&view=rev
Log:
Backport r675816 from the trunk.
When searching for DSOs, look in apr-util-APU_MAJOR_VERSION subdirectory
of each component of APR_DSOPATH.
PR 45327

Modified:
    apr/apr-util/branches/1.3.x/CHANGES
    apr/apr-util/branches/1.3.x/misc/apu_dso.c

Modified: apr/apr-util/branches/1.3.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/CHANGES?rev=675817&r1=675816&r2=675817&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/CHANGES [utf-8] (original)
+++ apr/apr-util/branches/1.3.x/CHANGES [utf-8] Thu Jul 10 17:25:47 2008
@@ -10,6 +10,10 @@
   *) Detection of PostgreSQL may fail if LIBS contains all libs returned by
      pg_config. Use it only as the last resort. [Bojan Smojver]
 
+  *) When searching for DSOs, look in apr-util-APU_MAJOR_VERSION subdirectory
+     of each component of APR_DSOPATH. PR 45327
+     [Joe Orton, William Rowe, Bojan Smojver]
+
 Changes with APR-util 1.3.2
 
   *) Fix parameter parsing error in ODBC DBD driver.  [Tom Donovan]

Modified: apr/apr-util/branches/1.3.x/misc/apu_dso.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/misc/apu_dso.c?rev=675817&r1=675816&r2=675817&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/misc/apu_dso.c (original)
+++ apr/apr-util/branches/1.3.x/misc/apu_dso.c Thu Jul 10 17:25:47 2008
@@ -162,6 +162,19 @@
         if (rv == APR_SUCCESS) { /* APR_EDSOOPEN */
             break;
         }
+        else if (i < paths->nelts - 1) {
+             /* try with apr-util-APU_MAJOR_VERSION appended */
+            eos = apr_cpystrn(eos,
+                              "apr-util-" APU_STRINGIFY(APU_MAJOR_VERSION) "/",
+                              sizeof(path) - (eos - path));
+
+            apr_cpystrn(eos, module, sizeof(path) - (eos - path));
+
+            rv = apr_dso_load(&dlhandle, path, global);
+            if (rv == APR_SUCCESS) { /* APR_EDSOOPEN */
+                break;
+            }
+        }
     }
 
     if (rv != APR_SUCCESS) /* APR_ESYMNOTFOUND */



Mime
View raw message