From 315cd7450950b318ab7728f9f682e3715aabf24c Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Fri, 24 Jan 2014 22:10:12 +0000 Subject: [PATCH] Revert to assuming APR uses ftok(..,1) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1561211 13f79535-47bb-0310-9956-ffa450edef68 --- modules/slotmem/mod_slotmem_shm.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/modules/slotmem/mod_slotmem_shm.c b/modules/slotmem/mod_slotmem_shm.c index 9707a6224f..b892cb775c 100644 --- a/modules/slotmem/mod_slotmem_shm.c +++ b/modules/slotmem/mod_slotmem_shm.c @@ -98,20 +98,12 @@ static apr_status_t unixd_set_shm_perms(const char *fname) int shmid; apr_ssize_t slen = strlen(fname); - shmkey = ftok(fname, - (int)apr_hashfunc_default(fname, &slen)); + shmkey = ftok(fname, 1); if (shmkey == (key_t)-1) { return errno; } if ((shmid = shmget(shmkey, 0, SHM_R | SHM_W)) == -1) { - /* 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; - } + return errno; } #if MODULE_MAGIC_NUMBER_MAJOR <= 20081212 #define ap_unixd_config unixd_config -- 2.40.0