You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2002/04/22 14:36:18 UTC
cvs commit: apache-1.3/src/os/unix os.c
jim 02/04/22 05:36:18
Modified: src CHANGES
src/os/unix os.c
Log:
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).
Submitted by: Marko Karppinen <ma...@php.net>
Reviewed by: Jim Jagielski, Wilfredo Sanchez
Revision Changes Path
1.1812 +5 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1811
retrieving revision 1.1812
diff -u -r1.1811 -r1.1812
--- CHANGES 19 Apr 2002 19:30:31 -0000 1.1811
+++ CHANGES 22 Apr 2002 12:36:18 -0000 1.1812
@@ -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 <ma...@php.net>]
+
*) Correct proxy to be able to handle the unexpected 100-continue
reponses sent during PUT or POST requests. [Graham Leggett]
1.22 +4 -0 apache-1.3/src/os/unix/os.c
Index: os.c
===================================================================
RCS file: /home/cvs/apache-1.3/src/os/unix/os.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- os.c 12 Nov 2001 17:36:38 -0000 1.21
+++ os.c 22 Apr 2002 12:36:18 -0000 1.22
@@ -111,7 +111,11 @@
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;