Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@www.apache.org Received: (qmail 77477 invoked from network); 13 Dec 2004 07:40:11 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 13 Dec 2004 07:40:11 -0000 Received: (qmail 56274 invoked by uid 500); 13 Dec 2004 07:39:54 -0000 Delivered-To: apmail-jakarta-tomcat-dev-archive@jakarta.apache.org Received: (qmail 56236 invoked by uid 500); 13 Dec 2004 07:39:53 -0000 Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Tomcat Developers List" Reply-To: "Tomcat Developers List" Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 56222 invoked by uid 500); 13 Dec 2004 07:39:53 -0000 Received: (qmail 56217 invoked by uid 99); 13 Dec 2004 07:39:53 -0000 X-ASF-Spam-Status: No, hits=-10.0 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; Sun, 12 Dec 2004 23:39:52 -0800 Received: (qmail 77375 invoked by uid 1526); 13 Dec 2004 07:39:51 -0000 Date: 13 Dec 2004 07:39:51 -0000 Message-ID: <20041213073951.77374.qmail@minotaur.apache.org> From: mturk@apache.org To: jakarta-tomcat-connectors-cvs@apache.org Subject: cvs commit: jakarta-tomcat-connectors/jk/native/common jk_ajp_common.c X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N mturk 2004/12/12 23:39:51 Modified: jk/native/common jk_ajp_common.c Log: Fix the bug initializing ajp. The worker will not initialize if cache_size was set to zero. Revision Changes Path 1.66 +7 -6 jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.c Index: jk_ajp_common.c =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.c,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- jk_ajp_common.c 26 Nov 2004 16:59:51 -0000 1.65 +++ jk_ajp_common.c 13 Dec 2004 07:39:51 -0000 1.66 @@ -1666,7 +1666,7 @@ jk_map_t *props, jk_worker_env_t *we, jk_logger_t *l, int proto) { int cache; - + int rc = JK_FALSE; /* * start the connection cache */ @@ -1682,7 +1682,7 @@ jk_log(l, JK_LOG_ERROR, "unknown protocol %d\n", proto); JK_TRACE_EXIT(l); - return JK_FALSE; + return rc; } if (pThis && pThis->worker_private) { @@ -1782,19 +1782,20 @@ p->ep_cache[i] = NULL; } JK_INIT_CS(&(p->cs), i); - if (i) { + if (i == JK_FALSE) { JK_TRACE_EXIT(l); - return JK_TRUE; + return JK_FALSE; } } } + rc = JK_TRUE; } else { JK_LOG_NULL_PARAMS(l); } JK_TRACE_EXIT(l); - return JK_FALSE; + return rc; } int ajp_destroy(jk_worker_t **pThis, jk_logger_t *l, int proto) --------------------------------------------------------------------- To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org