httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: apache-1.3/src/include ap_config.h
Date Tue, 01 Jun 2004 16:42:22 GMT
wrowe       2004/06/01 09:42:22

  Modified:    src/include ap_config.h
  Log:
    HPUX11 must be tested before HPUX, since the former
    is a superset of the other, and sane environments may
    define both.
  
    In the process, define HAVE_MMAP and USE_MMAP_FILES.
    Testing confirms this works fine.
  
    Drop the commented-out USE_MMAP_SCOREBOARD and
    HAVE_PTHREAD_SERIALIZED_ACCEPT defines, since they
    don't suggest the corresponding USE_SHMGET_SCOREBOARD
    and HAVE_FCNTL_SERIALIZED_ACCEPT must be commented out
    for the compiled httpd to behave as expected.  Also,
    the other platforms don't show alternatives, so this
    seemed inconsistent.
  
    In testing, USE_MMAP_SCOREBOARD works just fine, however
    USE_SHMGET_SCOREBOARD is preferred on linux where both
    are also supported, so I left the current default and
    followed the linux preference.
  
    Have not tested HAVE_PTHREAD_SERIALIZED_ACCEPT.
  
  Revision  Changes    Path
  1.337     +15 -18    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.336
  retrieving revision 1.337
  diff -u -r1.336 -r1.337
  --- ap_config.h	29 Mar 2004 17:33:52 -0000	1.336
  +++ ap_config.h	1 Jun 2004 16:42:22 -0000	1.337
  @@ -189,6 +189,21 @@
   #define SELECT_NEEDS_CAST
   #define HAVE_SYSLOG 1
   
  +#elif defined(HPUX11)
  +#ifndef _HPUX_SOURCE
  +#define _HPUX_SOURCE
  +#endif
  +#define HAVE_SHMGET
  +#define USE_SHMGET_SCOREBOARD
  +#undef  HAVE_GMTOFF
  +#define HAVE_FCNTL_SERIALIZED_ACCEPT
  +#define HAVE_MMAP
  +#define USE_MMAP_FILES
  +#define NO_KILLPG
  +#undef  NO_SETSID
  +#define HAVE_SYSLOG
  +#define AP_ENABLE_EXCEPTION_HOOK
  +
   #elif defined(HPUX) || defined(HPUX10)
   #undef HAVE_GMTOFF
   #define NO_KILLPG
  @@ -204,24 +219,6 @@
   #define SELECT_NEEDS_CAST
   typedef int rlim_t;
   #endif
  -
  -#elif defined(HPUX11)
  -#ifndef _HPUX_SOURCE
  -#define _HPUX_SOURCE
  -#endif
  -#define HAVE_SHMGET
  -#define USE_SHMGET_SCOREBOARD
  -#undef  HAVE_GMTOFF
  -#define HAVE_FCNTL_SERIALIZED_ACCEPT
  -/* feeling brave?  want to try using POSIX mutexes? */
  -/* #define HAVE_MMAP */
  -/* #define USE_MMAP_SCOREBOARD */
  -/* #define USE_MMAP_FILES */
  -/* #define HAVE_PTHREAD_SERIALIZED_ACCEPT */
  -#define NO_KILLPG
  -#undef  NO_SETSID
  -#define HAVE_SYSLOG
  -#define AP_ENABLE_EXCEPTION_HOOK
   
   #elif defined(AIX)
   #undef HAVE_GMTOFF
  
  
  

Mime
View raw message