From: Jim Jagielski <jim@apache.org>
Date: Mon, 22 Apr 2002 12:36:18 +0000 (+0000)
Subject: For supported versions of Darwin, place dynamically loaded
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c3595b4eaf9b4767c2ace922cc05e4d69ea79ff7;p=thirdparty%2Fapache%2Fhttpd.git

For supported versions of Darwin, place dynamically loaded
Apache extensions' public symbols into the global symbol
table. This allows dynamically loaded PHP extensions.
NOTE: this works as long as multiple modules don't
include overlapping symbols. Jim added the wrapper to
check for the existance of the option (which doesn't
exist in Rhapsody).

PR:
Obtained from:
Submitted by:	Marko Karppinen <markonen@php.net>
Reviewed by:	Jim Jagielski, Wilfredo Sanchez


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@94753 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/src/CHANGES b/src/CHANGES
index e05d27dce82..8aca1d58e0b 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -1,5 +1,10 @@
 Changes with Apache 1.3.25
 
+  *) For supported versions of Darwin, place dynamically loaded
+     Apache extensions' public symbols into the global symbol
+     table. This allows dynamically loaded PHP extensions.
+     [Marko Karppinen <markonen@php.net>]
+
   *) Correct proxy to be able to handle the unexpected 100-continue
      reponses sent during PUT or POST requests. [Graham Leggett]
 
diff --git a/src/os/unix/os.c b/src/os/unix/os.c
index afccc315a98..0a07e849f80 100644
--- a/src/os/unix/os.c
+++ b/src/os/unix/os.c
@@ -111,7 +111,11 @@ void *ap_os_dso_load(const char *path)
     if (NSCreateObjectFileImageFromFile(path, &image) !=
         NSObjectFileImageSuccess)
         return NULL;
+#if defined(NSLINKMODULE_OPTION_NONE)
+    handle = NSLinkModule(image, path, NSLINKMODULE_OPTION_NONE);
+#else
     handle = NSLinkModule(image, path, TRUE);
+#endif
     NSDestroyObjectFileImage(image);
     return handle;