Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 12124 invoked from network); 2 Dec 2006 07:30:31 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 Dec 2006 07:30:31 -0000 Received: (qmail 53243 invoked by uid 500); 2 Dec 2006 07:30:40 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 53210 invoked by uid 500); 2 Dec 2006 07:30:40 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: Reply-To: dev@apr.apache.org List-Id: Delivered-To: mailing list commits@apr.apache.org Received: (qmail 53198 invoked by uid 99); 2 Dec 2006 07:30:40 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Dec 2006 23:30:40 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Dec 2006 23:30:30 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 56B201A9846; Fri, 1 Dec 2006 23:29:51 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r481516 - /apr/apr-util/trunk/memcache/apr_memcache.c Date: Sat, 02 Dec 2006 07:29:50 -0000 To: commits@apr.apache.org From: pquerna@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061202072951.56B201A9846@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: pquerna Date: Fri Dec 1 23:29:48 2006 New Revision: 481516 URL: http://svn.apache.org/viewvc?view=rev&rev=481516 Log: Remove the active server from the pollset before returning it's socket to the resource list, preventing any race conditions. Modified: apr/apr-util/trunk/memcache/apr_memcache.c Modified: apr/apr-util/trunk/memcache/apr_memcache.c URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/memcache/apr_memcache.c?view=diff&rev=481516&r1=481515&r2=481516 ============================================================================== --- apr/apr-util/trunk/memcache/apr_memcache.c (original) +++ apr/apr-util/trunk/memcache/apr_memcache.c Fri Dec 1 23:29:48 2006 @@ -1337,10 +1337,10 @@ } else if (strncmp(MS_END, conn->buffer, MS_END_LEN) == 0) { /* this connection is done */ + apr_pollset_remove (pollset, &activefds[i]); ms_release_conn(ms, conn); apr_hash_set(server_queries, &ms, sizeof(ms), NULL); - apr_pollset_remove (pollset, &activefds[i]); queries_sent--; } else {