Return-Path: Delivered-To: apmail-httpd-dev-archive@www.apache.org Received: (qmail 14900 invoked from network); 4 Aug 2006 15:09:38 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 4 Aug 2006 15:09:38 -0000 Received: (qmail 53375 invoked by uid 500); 4 Aug 2006 15:09:33 -0000 Delivered-To: apmail-httpd-dev-archive@httpd.apache.org Received: (qmail 53245 invoked by uid 500); 4 Aug 2006 15:09:32 -0000 Mailing-List: contact dev-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list dev@httpd.apache.org Received: (qmail 53224 invoked by uid 99); 4 Aug 2006 15:09:32 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Aug 2006 08:09:32 -0700 X-ASF-Spam-Status: No, hits=-0.0 required=10.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: domain of chip@force-elite.com designates 72.232.80.58 as permitted sender) Received: from [72.232.80.58] (HELO constant.northnitch.com) (72.232.80.58) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Aug 2006 08:09:31 -0700 Received: from localhost (localhost.layeredtech.com [127.0.0.1]) by constant.northnitch.com (Postfix) with ESMTP id A85575C48; Fri, 4 Aug 2006 10:09:08 -0500 (CDT) Received: from constant.northnitch.com ([127.0.0.1]) by localhost (constant.northnitch.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 87688-04; Fri, 4 Aug 2006 10:09:08 -0500 (CDT) Received: from [192.168.1.102] (c-71-202-111-132.hsd1.ca.comcast.net [71.202.111.132]) by constant.northnitch.com (Postfix) with ESMTP id 143E95C3F; Fri, 4 Aug 2006 10:09:08 -0500 (CDT) Message-ID: <44D3631C.90904@force-elite.com> Date: Fri, 04 Aug 2006 08:09:16 -0700 From: Paul Querna User-Agent: Thunderbird 1.5.0.5 (Windows/20060719) MIME-Version: 1.0 To: dev@httpd.apache.org CC: cvs@httpd.apache.org Subject: Re: svn commit: r428700 - /httpd/httpd/branches/httpd-proxy-scoreboard/modules/mem/sharedmem_util.c References: <20060804114402.200341A981A@eris.apache.org> In-Reply-To: <20060804114402.200341A981A@eris.apache.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Virus-Scanned: by amavisd-new at constant.northnitch.com X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N jfclere@apache.org wrote: > Author: jfclere > Date: Fri Aug 4 04:44:01 2006 > New Revision: 428700 > > URL: http://svn.apache.org/viewvc?rev=428700&view=rev > Log: > Remove shared memory before creating it. (That only removes the file!). > > Modified: > httpd/httpd/branches/httpd-proxy-scoreboard/modules/mem/sharedmem_util.c > > Modified: httpd/httpd/branches/httpd-proxy-scoreboard/modules/mem/sharedmem_util.c > URL: http://svn.apache.org/viewvc/httpd/httpd/branches/httpd-proxy-scoreboard/modules/mem/sharedmem_util.c?rev=428700&r1=428699&r2=428700&view=diff > ============================================================================== > --- httpd/httpd/branches/httpd-proxy-scoreboard/modules/mem/sharedmem_util.c (original) > +++ httpd/httpd/branches/httpd-proxy-scoreboard/modules/mem/sharedmem_util.c Fri Aug 4 04:44:01 2006 > @@ -210,12 +210,15 @@ > } > 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); This line should be: } else { Thanks, -Paul