Commit f37c38e9 authored by Jean-Frederic Clere's avatar Jean-Frederic Clere
Browse files

Remove shared memory before creating it. (That only removes the file!). 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@428700 13f79535-47bb-0310-9956-ffa450edef68
parent 4f54f4ff

modules/mem/sharedmem_util.c

+6 −3
Original line number Diff line number Diff line
@@ -210,12 +210,15 @@ static apr_status_t ap_slotmem_create(ap_slotmem_t **new, const char *name, apr_ 
        }

        ptr = ptr +  sizeof(desc);

    } else  {

        if (name && name[0] != ':')

        if (name && name[0] != ':') {

            apr_shm_remove(fname, globalpool);

            rv = apr_shm_create(&res->shm, item_size * item_num + sizeof(struct sharedslotdesc), fname, globalpool);

        else

        } else {

            rv = apr_shm_create(&res->shm, item_size * item_num + sizeof(struct sharedslotdesc), NULL, globalpool);

        if (rv != APR_SUCCESS)

        }

        if (rv != APR_SUCCESS) {

            return rv;

        }

        ptr = apr_shm_baseaddr_get(res->shm);

        desc.item_size = item_size;

        desc.item_num = item_num;