You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by st...@hyperreal.org on 1999/12/10 17:10:44 UTC
cvs commit: apache-2.0/src/os/unix os.h os.c
stoddard 99/12/10 08:10:43
Modified: src/support httpd.exp
src/os/unix os.h os.c
Log:
AIX DSO tweaks. Enable use of native DSO for AIX 4.3 and beyond. Apache DSO
emulation breaks with 64-bit compiles of Apache and AIX DSO support is broken
in releases prior to 4.3.
Revision Changes Path
1.4 +1 -1 apache-2.0/src/support/httpd.exp
Index: httpd.exp
===================================================================
RCS file: /home/cvs/apache-2.0/src/support/httpd.exp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- httpd.exp 1999/11/30 05:56:17 1.3
+++ httpd.exp 1999/12/10 16:10:41 1.4
@@ -1,4 +1,4 @@
-#!
+#! .
ap_MD5Encode
ap_MD5Final
ap_MD5Init
1.6 +4 -1 apache-2.0/src/os/unix/os.h
Index: os.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/os/unix/os.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- os.h 1999/11/30 05:56:11 1.5
+++ os.h 1999/12/10 16:10:42 1.6
@@ -104,10 +104,13 @@
#endif
/*
- * Do not use native AIX DSO support
+ * Do not use native AIX DSO support on releases of AIX prior
+ * to V4.3
*/
#ifdef AIX
+#if AIX < 43
#undef HAVE_DLFCN_H
+#endif
#endif
#ifdef HAVE_DLFCN_H
1.5 +61 -1 apache-2.0/src/os/unix/os.c
Index: os.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/os/unix/os.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- os.c 1999/10/13 02:41:08 1.4
+++ os.c 1999/12/10 16:10:42 1.5
@@ -1,3 +1,60 @@
+/* ====================================================================
+ * Copyright (c) 1998-1999 The Apache Group. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ * software must display the following acknowledgment:
+ * "This product includes software developed by the Apache Group
+ * for use in the Apache HTTP server project (http://www.apache.org/)."
+ *
+ * 4. The names "Apache Server" and "Apache Group" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For written permission, please contact
+ * apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ * nor may "Apache" appear in their names without prior written
+ * permission of the Apache Group.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by the Apache Group
+ * for use in the Apache HTTP server project (http://www.apache.org/)."
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE APACHE GROUP OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Group and was originally based
+ * on public domain software written at the National Center for
+ * Supercomputing Applications, University of Illinois, Urbana-Champaign.
+ * For more information on the Apache Group and the Apache HTTP server
+ * project, please see <http://www.apache.org/>.
+ *
+ */
+
/*
* This file will include OS specific functions which are not inlineable.
* Any inlineable functions should be defined in os-inline.c instead.
@@ -14,10 +71,13 @@
void ap_is_not_here(void) {}
/*
- * Insert the DSO emulation code for AIX
+ * Insert the DSO emulation code for AIX for releases of AIX prior
+ * to 4.3. Use the native DSO code for 4.3 and later.
*/
#ifdef AIX
+#if AIX < 43
#include "os-aix-dso.c"
+#endif
#endif
/*