summaryrefslogtreecommitdiff
path: root/www/apache
diff options
context:
space:
mode:
authorjdolecek <jdolecek>2001-02-27 20:04:23 +0000
committerjdolecek <jdolecek>2001-02-27 20:04:23 +0000
commit172a56235b143fd32b7c352eb8eba621ebf486a0 (patch)
treeb7149228c329020301a9456ebc4f71e2656316dc /www/apache
parent86681e1a07e2b52902c434f19e8ebb4bc543348f (diff)
downloadpkgsrc-172a56235b143fd32b7c352eb8eba621ebf486a0.tar.gz
Put back the patch to avoid dlclose(). Without the patch, it's not
possible to use LoadModule at all (httpd crashes soon after it forks). This is most probably an Apache problem. Until the real problem is tracked down, put this in as workaround. This addresses lib/12164 and bin/12283.
Diffstat (limited to 'www/apache')
-rw-r--r--www/apache/files/patch-sum3
-rw-r--r--www/apache/patches/patch-ag18
2 files changed, 20 insertions, 1 deletions
diff --git a/www/apache/files/patch-sum b/www/apache/files/patch-sum
index d9f38eacb00..77b30bc7855 100644
--- a/www/apache/files/patch-sum
+++ b/www/apache/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.13 2001/02/03 20:53:10 jlam Exp $
+$NetBSD: patch-sum,v 1.14 2001/02/27 20:04:23 jdolecek Exp $
MD5 (patch-aa) = 1f5ddd83cedeaff72df8c6428a8878ba
MD5 (patch-ab) = 86886e1e816bcc5527072c4027586cd3
@@ -6,5 +6,6 @@ MD5 (patch-ac) = afd85e3188013fa46392ccaa3727d09d
MD5 (patch-ad) = 40f2b9c12d7ef36bbc842480af61b833
MD5 (patch-ae) = c260133920eebada06030552c3306c3d
MD5 (patch-af) = 197a9b91da502834ec5d4cab2c99b2c1
+MD5 (patch-ag) = 6c7b5fd3185385e0b5309cb707516d18
MD5 (patch-ah) = e27e529142e5ee6fc1be0f965e5510e0
MD5 (patch-ai) = 57b95d04f0ed35252b8ead041017feac
diff --git a/www/apache/patches/patch-ag b/www/apache/patches/patch-ag
new file mode 100644
index 00000000000..e6a915c575c
--- /dev/null
+++ b/www/apache/patches/patch-ag
@@ -0,0 +1,18 @@
+$NetBSD: patch-ag,v 1.6 2001/02/27 20:04:23 jdolecek Exp $
+
+--- src/os/unix/os.c.orig Sat Jan 15 11:01:09 2000
++++ src/os/unix/os.c
+@@ -129,7 +129,12 @@
+ #elif defined(HAVE_DYLD)
+ NSUnLinkModule(handle,FALSE);
+
+-#else
++/*
++ * Work around Apache dlclose() bug, where shared objects may be
++ * dlclose()d before their cleanup procedures are called.
++ * This is needed so shared modules can be used.
++ */
++#elif 0
+ dlclose(handle);
+ #endif
+