Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 79285 invoked from network); 9 Mar 2005 18:11:02 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 9 Mar 2005 18:11:02 -0000 Received: (qmail 28161 invoked by uid 500); 9 Mar 2005 18:11:01 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 28038 invoked by uid 500); 9 Mar 2005 18:10:59 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 28023 invoked by uid 99); 9 Mar 2005 18:10:59 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Wed, 09 Mar 2005 10:10:58 -0800 Received: (qmail 79208 invoked by uid 65534); 9 Mar 2005 18:10:57 -0000 Message-ID: <20050309181057.79203.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mailer: svnmailer-1.0.0-dev Date: Wed, 09 Mar 2005 18:10:57 -0000 Subject: svn commit: r156665 - httpd/httpd/trunk/modules/ldap/util_ldap_cache.c To: cvs@httpd.apache.org From: bnicholes@apache.org X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: bnicholes Date: Wed Mar 9 10:10:47 2005 New Revision: 156665 URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D156665 Log: Don't attempt to remove the cache_file if one was never specified. Modified: httpd/httpd/trunk/modules/ldap/util_ldap_cache.c Modified: httpd/httpd/trunk/modules/ldap/util_ldap_cache.c URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/ldap/util_ldap= _cache.c?view=3Ddiff&r1=3D156664&r2=3D156665 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- httpd/httpd/trunk/modules/ldap/util_ldap_cache.c (original) +++ httpd/httpd/trunk/modules/ldap/util_ldap_cache.c Wed Mar 9 10:10:47 20= 05 @@ -394,7 +394,9 @@ if (st->cache_shm !=3D NULL) { apr_status_t result =3D apr_shm_destroy(st->cache_shm); st->cache_shm =3D NULL; - apr_file_remove(st->cache_file, st->pool); + if (st->cache_file) { + apr_file_remove(st->cache_file, st->pool); + } return result; } #endif