Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 32028 invoked from network); 2 Sep 2007 19:48:53 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 Sep 2007 19:48:53 -0000 Received: (qmail 32005 invoked by uid 500); 2 Sep 2007 19:48:45 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 31957 invoked by uid 500); 2 Sep 2007 19:48:45 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 31946 invoked by uid 500); 2 Sep 2007 19:48:45 -0000 Delivered-To: apmail-jakarta-tomcat-dev@jakarta.apache.org Received: (qmail 31943 invoked by uid 99); 2 Sep 2007 19:48:45 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 02 Sep 2007 12:48:45 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED 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; Sun, 02 Sep 2007 19:49:58 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D48801A983A; Sun, 2 Sep 2007 12:48:27 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r572131 - /tomcat/connectors/trunk/jk/native/common/jk_map.c Date: Sun, 02 Sep 2007 19:48:27 -0000 To: tomcat-dev@jakarta.apache.org From: rjung@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20070902194827.D48801A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rjung Date: Sun Sep 2 12:48:27 2007 New Revision: 572131 URL: http://svn.apache.org/viewvc?rev=572131&view=rev Log: Replace NULL by an empty string as a marker for worker references that have already been applied. Modified: tomcat/connectors/trunk/jk/native/common/jk_map.c Modified: tomcat/connectors/trunk/jk/native/common/jk_map.c URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_map.c?rev=572131&r1=572130&r2=572131&view=diff ============================================================================== --- tomcat/connectors/trunk/jk/native/common/jk_map.c (original) +++ tomcat/connectors/trunk/jk/native/common/jk_map.c Sun Sep 2 12:48:27 2007 @@ -756,7 +756,8 @@ "Checking for references with prefix %s with%s wildcard (recursion %d)", prefix, wildcard? "" : "out", depth); for (i = 0; i < m->size; i++) { - if (m->values[i] && !strncmp(m->names[i], prefix, prelen)) { + if (m->values[i] && *(m->values[i]) && + !strncmp(m->names[i], prefix, prelen)) { size_t remain = strlen(m->names[i]) - prelen; if ((remain == JK_MAP_REFERENCE_SZ ) || (wildcard && remain > JK_MAP_REFERENCE_SZ)) { remain = strlen(m->names[i]) - JK_MAP_REFERENCE_SZ; @@ -792,7 +793,7 @@ if (rc == JK_FALSE) { break; } - m->values[i] = NULL; + *(m->values[i]) = '\0'; } } } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org