From: Bradley Nicholes <bnicholes@apache.org>
Date: Wed, 26 Feb 2003 22:24:01 +0000 (+0000)
Subject: Skip some more close on exec magic for NetWare
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe379e005ab3fb825ad6bc8e564f774a098306b3;p=thirdparty%2Fapache%2Fhttpd.git

Skip some more close on exec magic for NetWare


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

diff --git a/src/main/alloc.c b/src/main/alloc.c
index da9bd748524..8ce98cb7452 100644
--- a/src/main/alloc.c
+++ b/src/main/alloc.c
@@ -1858,6 +1858,9 @@ static int fd_magic_cleanup(void *fdv)
 
 API_EXPORT(void) ap_note_cleanups_for_fd_ex(pool *p, int fd, int domagic)
 {
+#if defined(NETWARE)
+    domagic = 0; /* skip magic for NetWare, at least for now */
+#endif
     ap_register_cleanup_ex(p, (void *) (long) fd, fd_cleanup, fd_cleanup,
                            domagic ? fd_magic_cleanup : NULL);
 }
@@ -1974,6 +1977,9 @@ static int file_magic_cleanup(void *fpv)
 
 API_EXPORT(void) ap_note_cleanups_for_file_ex(pool *p, FILE *fp, int domagic)
 {
+#if defined(NETWARE)
+    domagic = 0; /* skip magic for NetWare, at least for now */
+#endif
     ap_register_cleanup_ex(p, (void *) fp, file_cleanup, file_child_cleanup,
                            domagic ? file_magic_cleanup : NULL);
 }