[I'm collecting and presenting a number of internal patches which have been used and deployed in production for some time now... I'll toss out as patches and commit Tuesday if I hear no objections. Feedback welcome.]
When the ap_config.h logic for HPUX11 was added, that #elif case was inserted *after* testing for HPUX or HPUX10. It's entirely reasonable to find HPUX and HPUX11 definined by the compiler. This patch move HPUX11 ahead of the HPUX case, enables the HAVE_MMAP and USE_MMAP_FILES logic, and drops the misleading commented options. I've seen where USE_MMAP_SCOREBOARD has been un-commented without dropping USE_SHMGET_SCOREBOARD, and HAVE_PTHREAD_SERIALIZED_ACCEPT has been enabled without disabling HAVE_FCNTL_SERIALED_ACCEPT. The way these commented-out options were added was misleading. I didn't see such code in other paths, so dropping the comments seemed rational. I didn't enable USE_MMAP_SCOREBOARD since both work, and the Linux case prefers USE_SHMGET_SCOREBOARD where both alternatives exist. But, it has been tested, does work, and could be made the default if anyone offers an argument to change this. Bill
--- src/include/ap_config.h 29 Mar 2004 17:33:52 -0000 1.336 +++ src/include/ap_config.h 17 May 2004 17:03:19 -0000 @@ -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 @@ -205,24 +220,6 @@ 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 #undef NO_KILLPG
