Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 74897 invoked from network); 5 Nov 2007 13:35:28 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 5 Nov 2007 13:35:28 -0000 Received: (qmail 50685 invoked by uid 500); 5 Nov 2007 13:35:12 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 50640 invoked by uid 500); 5 Nov 2007 13:35:12 -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 50629 invoked by uid 500); 5 Nov 2007 13:35:12 -0000 Delivered-To: apmail-jakarta-tomcat-dev@jakarta.apache.org Received: (qmail 50626 invoked by uid 99); 5 Nov 2007 13:35:12 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Nov 2007 05:35:12 -0800 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; Mon, 05 Nov 2007 13:35:24 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id DC8191A9832; Mon, 5 Nov 2007 05:35:03 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r591990 - /tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Date: Mon, 05 Nov 2007 13:35:03 -0000 To: tomcat-dev@jakarta.apache.org From: mturk@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071105133503.DC8191A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mturk Date: Mon Nov 5 05:35:02 2007 New Revision: 591990 URL: http://svn.apache.org/viewvc?rev=591990&view=rev Log: Allocate temporary mount maps on first directive Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?rev=591990&r1=591989&r2=591990&view=diff ============================================================================== --- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original) +++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Mon Nov 5 05:35:02 2007 @@ -898,6 +898,11 @@ if (c[0] != '/') return "JkMount context should start with /"; + if (!conf->uri_to_context) { + if (!jk_map_alloc(&(conf->uri_to_context))) { + return "JkMount Memory error"; + } + } /* * Add the new worker to the alias map. */ @@ -942,6 +947,12 @@ return "JkUnMount context should start with /"; uri = apr_pstrcat(cmd->temp_pool, "!", c, NULL); + + if (!conf->uri_to_context) { + if (!jk_map_alloc(&(conf->uri_to_context))) { + return "JkUnMount Memory error"; + } + } /* * Add the new worker to the alias map. */ --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org