From b98527874d372613936e0d92e46b5045178f47be Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Fri, 24 Jan 2014 21:40:35 +0000 Subject: [PATCH] Avoid APR check. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1561200 13f79535-47bb-0310-9956-ffa450edef68 --- modules/slotmem/mod_slotmem_shm.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/modules/slotmem/mod_slotmem_shm.c b/modules/slotmem/mod_slotmem_shm.c index 1af401503c..9707a6224f 100644 --- a/modules/slotmem/mod_slotmem_shm.c +++ b/modules/slotmem/mod_slotmem_shm.c @@ -97,18 +97,21 @@ static apr_status_t unixd_set_shm_perms(const char *fname) key_t shmkey; int shmid; -#if APR_VERSION_AT_LEAST(1,5,1) apr_ssize_t slen = strlen(fname); shmkey = ftok(fname, (int)apr_hashfunc_default(fname, &slen)); -#else - shmkey = ftok(fname, 1); -#endif if (shmkey == (key_t)-1) { return errno; } if ((shmid = shmget(shmkey, 0, SHM_R | SHM_W)) == -1) { - return errno; + /* see if we are using a key of 1 */ + shmkey = ftok(fname, 1); + if (shmkey == (key_t)-1) { + return errno; + } + if ((shmid = shmget(shmkey, 0, SHM_R | SHM_W)) == -1) + return errno; + } } #if MODULE_MAGIC_NUMBER_MAJOR <= 20081212 #define ap_unixd_config unixd_config -- 2.40.0