httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: apache-1.3/src/os/unix os.c os.h
Date Thu, 03 Oct 2002 19:58:09 GMT
trawick     2002/10/03 12:58:09

  Modified:    src      CHANGES Configure
               src/include ap_config.h
               src/os/unix os.c os.h
  Log:
  PORT: Enable SINGLE_LISTEN_UNSERIALIZED_ACCEPT for AIX 4.3.2
  and above.  Rewrite configure logic for modern levels of
  AIX to support future releases of AIX with no changes to
  Apache.
  
  This is basically a housekeeping matter to avoid having separate
  stanzas for each AIX release and to add some finer detail to
  the -DAIX=xxx value so that we know when to enable
  SINGLE_LISTEN_UNSERIALIZED_ACCEPT.
  
  I suspect that this fixes the recognition of AIX on ia64, but
  nobody complained when it was broken and I don't know where to
  find such a beast.
  
  Revision  Changes    Path
  1.1859    +4 -1      apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1858
  retrieving revision 1.1859
  diff -u -r1.1858 -r1.1859
  --- CHANGES	30 Sep 2002 16:42:10 -0000	1.1858
  +++ CHANGES	3 Oct 2002 19:58:08 -0000	1.1859
  @@ -1,6 +1,9 @@
   Changes with Apache 1.3.28
   
  -
  +  *) PORT: Enable SINGLE_LISTEN_UNSERIALIZED_ACCEPT for AIX 4.3.2
  +     and above.  Update AIX configure logic to allow higher AIX 
  +     release numbers without having to change Apache.
  +     [Jeff Trawick]
   
   Changes with Apache 1.3.27
   
  
  
  
  1.459     +33 -33    apache-1.3/src/Configure
  
  Index: Configure
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/Configure,v
  retrieving revision 1.458
  retrieving revision 1.459
  diff -u -r1.458 -r1.459
  --- Configure	30 Sep 2002 16:42:11 -0000	1.458
  +++ Configure	3 Oct 2002 19:58:08 -0000	1.459
  @@ -300,40 +300,9 @@
   	;;
       i386-ibm-aix*)
   	OS='IBM AIX PS/2'
  -	CFLAGS="$CFLAGS -DAIX=1 -U__STR__ -DUSEBCOPY"
  +	CFLAGS="$CFLAGS -DAIX=100 -U__STR__ -DUSEBCOPY"
   	DEF_WANTHSREGEX=no
   	;;
  -    *-ibm-aix[1-2].*)
  -	OS='IBM AIX 1.x/2.x'
  -	CFLAGS="$CFLAGS -DAIX=1 -DNEED_RLIM_T -U__STR__"
  -	;;
  -    *-ibm-aix3.*)
  -	OS='IBM AIX 3.x'
  -	CFLAGS="$CFLAGS -DAIX=30 -DNEED_RLIM_T -U__STR__"
  -	;;
  -    *-ibm-aix4.1)
  -	OS='IBM AIX 4.1'
  -	CFLAGS="$CFLAGS -DAIX=41 -DNEED_RLIM_T -U__STR__"
  -	;;
  -    *-ibm-aix4.2)
  -	OS='IBM AIX 4.2'
  -	CFLAGS="$CFLAGS -DAIX=42 -U__STR__"
  -	LDFLAGS="$LDFLAGS -lm"
  -	;;
  -    *-ibm-aix4.3)
  -	OS='IBM AIX 4.3'
  -	CFLAGS="$CFLAGS -DAIX=43 -DUSE_PTHREAD_SERIALIZED_ACCEPT -U__STR__"
  -	LDFLAGS="$LDFLAGS -lm -lpthread"
  -	RULE_SHARED_CORE=no
  -	DEF_SHARED_CORE=no
  -	;;
  -    *-ibm-aix5.1)
  -	OS='IBM AIX 5.1'
  -	CFLAGS="$CFLAGS -DAIX=51 -DUSE_PTHREAD_SERIALIZED_ACCEPT -U__STR__"
  -	LDFLAGS="$LDFLAGS -lm -lpthread"
  -	RULE_SHARED_CORE=no
  -	DEF_SHARED_CORE=no
  -	;;
       ia64-ibm-aix*)
          OS='IBM AIX IA64'
          CFLAGS="$CFLAGS -DAIXIA64 -U__STR__"
  @@ -341,9 +310,40 @@
          RULE_SHARED_CORE=no
          DEF_SHARED_CORE=no
          ;;
  +    *-ibm-aix[1-2].*)
  +	OS='IBM AIX 1.x/2.x'
  +	CFLAGS="$CFLAGS -DAIX=100 -DNEED_RLIM_T -U__STR__"
  +	;;
  +    *-ibm-aix3.*)
  +	OS='IBM AIX 3.x'
  +	CFLAGS="$CFLAGS -DAIX=300 -DNEED_RLIM_T -U__STR__"
  +	;;
  +    *-ibm-aix[45678].*)
  +        PLATOSVERS=`echo $PLAT | sed 's/^.*ibm-aix//'`
  +        OS="AIX $PLATOSVERS"
  +        PLATOSVERSNUM=`echo $PLATOSVERS | sed 's/\.//'`
  +        if test $PLATOSVERSNUM -ge 43; then
  +            PLATOSVERSNUM=`oslevel | sed 's/\.//g' | sed 's/.$//'`
  +        else
  +            PLATOSVERSNUM="$PLATOSVERSNUM"0
  +        fi
  +        # PLATOSVERSNUM is a three digit number at this point
  +        CFLAGS="$CFLAGS -DAIX=$PLATOSVERSNUM -U__STR__"
  +        if test $PLATOSVERSNUM -lt 420; then
  +            CFLAGS="$CFLAGS -DNEED_RLIM_T"
  +        fi
  +        if test $PLATOSVERSNUM -ge 420; then
  +            LDFLAGS="$LDFLAGS -lm"
  +        fi
  +        if test $PLATOSVERSNUM -ge 430; then
  +            LDFLAGS="$LDFLAGS -lpthread"
  +            RULE_SHARED_CORE=no
  +            DEF_SHARED_CORE=no
  +        fi
  +        ;;
       *-ibm-aix*)
   	OS='IBM AIX'
  -	CFLAGS="$CFLAGS -DAIX=1 -U__STR__"
  +	CFLAGS="$CFLAGS -DAIX=100 -U__STR__"
   	LDFLAGS="$LDFLAGS -lm"
   	;;
       *-apollo-*)
  
  
  
  1.326     +10 -3     apache-1.3/src/include/ap_config.h
  
  Index: ap_config.h
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/include/ap_config.h,v
  retrieving revision 1.325
  retrieving revision 1.326
  diff -u -r1.325 -r1.326
  --- ap_config.h	10 Sep 2002 17:01:14 -0000	1.325
  +++ ap_config.h	3 Oct 2002 19:58:09 -0000	1.326
  @@ -284,15 +284,21 @@
   #define HAVE_FCNTL_SERIALIZED_ACCEPT
   #define HAVE_SYSVSEM_SERIALIZED_ACCEPT
   #define NEED_UNION_SEMUN
  -#if !defined(USE_PTHREAD_SERIALIZED_ACCEPT)
  +#if AIX >= 430
  +#define HAVE_PTHREAD_SERIALIZED_ACCEPT
  +#define USE_PTHREAD_SERIALIZED_ACCEPT
  +#else
   #define USE_FCNTL_SERIALIZED_ACCEPT
   #endif
  +#if AIX >= 432
  +#define SINGLE_LISTEN_UNSERIALIZED_ACCEPT 
  +#endif
   #ifdef USEBCOPY
   #define memmove(a,b,c) bcopy(b,a,c)
   #endif
  -#if AIX >= 51
  +#if AIX >= 510
   #define NET_SIZE_T socklen_t
  -#elif AIX >= 42
  +#elif AIX >= 420
   #define NET_SIZE_T size_t
   #endif
   
  @@ -990,6 +996,7 @@
   #define USE_MMAP_FILES
   #define NEED_UNION_SEMUN
   #define HAVE_SYSVSEM_SERIALIZED_ACCEPT
  +#define HAVE_FCNTL_SERIALIZED_ACCEPT
   #define _POSIX_SOURCE
   #include <signal.h>
   #ifdef SIGDUMP  /* SIGDUMP is not defined by OS/390 v1r2 */
  
  
  
  1.26      +1 -1      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.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- os.c	2 May 2002 13:28:46 -0000	1.25
  +++ os.c	3 Oct 2002 19:58:09 -0000	1.26
  @@ -18,7 +18,7 @@
    * to 4.3. Use the native DSO code for 4.3 and later.
    */
   #if defined(AIX) && !defined(NO_DL_NEEDED)
  -#if AIX < 43
  +#if AIX < 430
   #include "os-aix-dso.c"
   #endif
   #endif
  
  
  
  1.47      +1 -1      apache-1.3/src/os/unix/os.h
  
  Index: os.h
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/unix/os.h,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- os.h	13 Mar 2002 21:05:36 -0000	1.46
  +++ os.h	3 Oct 2002 19:58:09 -0000	1.47
  @@ -109,7 +109,7 @@
    * to 4.3. 
    */
   #ifdef AIX
  -#if AIX < 43
  +#if AIX < 430
   #undef HAVE_DLFCN_H
   #endif
   #endif
  
  
  

Mime
View raw message