Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 73039 invoked from network); 2 Nov 2007 23:01:19 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 Nov 2007 23:01:19 -0000 Received: (qmail 72602 invoked by uid 500); 2 Nov 2007 23:01:06 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 71833 invoked by uid 500); 2 Nov 2007 23:01:03 -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 71822 invoked by uid 500); 2 Nov 2007 23:01:03 -0000 Delivered-To: apmail-jakarta-tomcat-dev@jakarta.apache.org Received: (qmail 71819 invoked by uid 99); 2 Nov 2007 23:01:03 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Nov 2007 16:01:03 -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; Fri, 02 Nov 2007 23:01:15 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D4E2A1A9832; Fri, 2 Nov 2007 16:00:54 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r591504 - in /tomcat/connectors/trunk/jk/native: apache-1.3/mod_jk.c apache-2.0/mod_jk.c Date: Fri, 02 Nov 2007 23:00:54 -0000 To: tomcat-dev@jakarta.apache.org From: rjung@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071102230054.D4E2A1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rjung Date: Fri Nov 2 16:00:52 2007 New Revision: 591504 URL: http://svn.apache.org/viewvc?rev=591504&view=rev Log: Use new general purpose function jk_map_copy() instead of httpd private copy_jk_map(). Modified: tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Modified: tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c?rev=591504&r1=591503&r2=591504&view=diff ============================================================================== --- tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c (original) +++ tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Fri Nov 2 16:00:52 2007 @@ -2278,23 +2278,6 @@ } -static void copy_jk_map(ap_pool * p, server_rec * s, jk_map_t *src, - jk_map_t *dst) -{ - int sz = jk_map_size(src); - int i; - for (i = 0; i < sz; i++) { - const char *name = jk_map_name_at(src, i); - if (jk_map_get(dst, name, NULL) == NULL) { - if (!jk_map_put (dst, name, - ap_pstrdup(p, jk_map_get_string(src, name, NULL)), - NULL)) { - jk_error_exit(APLOG_MARK, APLOG_EMERG, s, p, "Memory error"); - } - } - } -} - static void *merge_jk_config(ap_pool * p, void *basev, void *overridesv) { jk_server_conf_t *base = (jk_server_conf_t *) basev; @@ -2361,8 +2344,9 @@ overrides->mount_file_reload = base->mount_file_reload; if (overrides->mountcopy == JK_TRUE || (overrides->mountcopy == JK_UNSET && jk_mount_copy_all == JK_TRUE)) { - copy_jk_map(p, overrides->s, base->uri_to_context, - overrides->uri_to_context); + if (jk_map_copy(base->uri_to_context, overrides->uri_to_context) == JK_FALSE) { + jk_error_exit(APLOG_MARK, APLOG_EMERG, overrides->s, p, "Memory error"); + } if (!overrides->mount_file) overrides->mount_file = base->mount_file; if (!overrides->alias_dir) 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=591504&r1=591503&r2=591504&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 Fri Nov 2 16:00:52 2007 @@ -2398,25 +2398,6 @@ } -/** Utility - copy a map . XXX Should move to jk_map, it's generic code. - */ -static void copy_jk_map(apr_pool_t * p, server_rec * s, jk_map_t *src, - jk_map_t *dst) -{ - int sz = jk_map_size(src); - int i; - for (i = 0; i < sz; i++) { - const char *name = jk_map_name_at(src, i); - if (jk_map_get(dst, name, NULL) == NULL) { - if (!jk_map_put(dst, name, - apr_pstrdup(p, jk_map_get_string(src, name, NULL)), - NULL)) { - jk_error_exit(APLOG_MARK, APLOG_EMERG, s, p, "Memory error"); - } - } - } -} - /** Standard apache callback, merge jk options specified in context or . */ @@ -2486,8 +2467,9 @@ overrides->mount_file_reload = base->mount_file_reload; if (overrides->mountcopy == JK_TRUE || (overrides->mountcopy == JK_UNSET && jk_mount_copy_all == JK_TRUE)) { - copy_jk_map(p, overrides->s, base->uri_to_context, - overrides->uri_to_context); + if (jk_map_copy(base->uri_to_context, overrides->uri_to_context) == JK_FALSE) { + jk_error_exit(APLOG_MARK, APLOG_EMERG, overrides->s, p, "Memory error"); + } if (!overrides->mount_file) overrides->mount_file = base->mount_file; if (!overrides->alias_dir) --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org