Update www/ap-jk and www/ap2-jk from 1.2.15 to 1.2.19

Changes between 1.2.18 and 1.2.19

    Native

        update	Docs: Add SetHandler and new env var to Apache config docs. (rjung)
        update	Apache 1.3: Backport "no-jk" feature. (rjung)
        update	Apache: Add an environment variable to make SetHandler "jakarta-servlet" more useful. The variable is JK_WORKER_NAME, but can be changed by the new directive JkWorkerIndicator. (rjung)
        fix	LB: Don't use single worker shortcut, if the single worker is being diabled. (rjung)
        fix	Status worker: Add short explanation of activation and error states to legend. (rjung)
        fix	Docs: Add meaning of zero timeout values for various timeouts in workers.properties. (rjung)
        fix	LB: Cleanup of Mladens forced recovery. (rjung)
        fix	LB: Do not change lb_value for recovering workers to max, if we are using BUSYNESS method. (rjung)
        fix	Apache: Since 1.2.14 mod_jk failed to detect client abort. (rjung)
        fix	Docs: Corrected description of JkEnvVar. (rjung)
        fix	Solaris: Detect filio.h in configure to make the new connection detection build on solaris (r432825). (rjung)
        update	Add feature to force the recovery of workers that are member of loadbalancer if all the members are in error state. This fixes the time gap where 503 was returned caused by recovery_timeout although the backend was ready to handle the requests. (mturk)
        update	Docs: Seperate deprecated directives in their own table. (rjung)
        update	Docs: Allow "-" and "_" in worker names. (rjung)
        update	Allow multiple lines with attributes "balance_workers" and "mount". (rjung)
        fix	Make jk_is_some_property match more precisely. (rjung)
        update	JkStatus: Make refresh interval changeable. (rjung)
        fix	JkStatus: Adjust display of recover time wrt. global maintenance. (rjung)
        update	LB: Resetting worker state from OK to NA, if worker has been idle too long. (rjung)
        fix	Avoid compiler warnings concerning the use of lb_*_type arrays. Use functions instead. (rjung)
        update	Added %R JkRequestLogFormat option for Apache 1 and Apache 2. (mturk)
        update	Allow changing jvm Route from status manager. (mturk)
        fix	Do not retun 400 if Tomcat fails in the midle of the post request. Return 500 insted. (mturk)
        update	LB: Combine ok/error/recovering/busy runtime states into a single scalar. (rjung)
        update	LB: Combine active/disabled/stopped configuration states into a single scalar. (rjung)
        update	LB: Add several Apache notes to enable standard logging for load balancer results. (rjung)
        update	LB: Reorganisation of the main load balancer service loop. (rjung)
        update	Implement hierarchical worker configuration via attribute "reference". (rjung)
        update	Log deprecated properties. (rjung)
        fix	IIS: Fix simple_rewrite for the cases where the rewritten url is larger then the original one. (mturk)
        update	New JkOption "DisableReuse" to disable connection persistence. (jim)
        update	LB: Move sessionid retrieval out of get_most_suitable_worker into service. (rjung)
        update	Code cleanup for all service methods (use TRACE, JK_LOG_NULL_PARAMS, null pointer checks). (rjung)
        update	JKSTATUS: add refresh link. No refresh for updates. Redirect to list view after update. (rjung)
        update	Add new hook add_log_items into servers. (rjung)
        update	APACHE httpd: Rename apache logging notes. (rjung)
        update	LB: Rename lock and method constants. Add constants for defaults. (rjung)
        fix	Default log level should be INFO and not DEBUG. Default log level should be the same for all server types. (rjung)
        fix	Make rewrite_rule_map and log_level as non mandatory directives for isapi_redirect. (mturk)
        fix	40107: Rewrite is_socket_connected function. Non blocking socket is not used any more. (mturk)
        update	Allow building with VS2005 without too many warnings. (mturk)
        fix	Decide by MMN, which piped log API we should use. mod_jk 1.2.18 broke compilation with Apache 1.3 pre 1.3.28. (rjung)

Changes between 1.2.17 and 1.2.18


    Native

        fix	Using socklen_t in getsockopt. Also introducing jk_sock_t. (mturk)
        update	Allow recovery wait time below 60 seconds (new minimum is 1 second). (mturk)

Changes between 1.2.16 and JK 1.2.17


    Native

        fix	Fix hanging jk status worker when certain attributes are being updated due to double locking. (rjung)
        update	Allow JkMount to behave like uriworkermap.properties by parsing pipe symbol as two directive marker. (mturk)

Changes between 1.2.15 and JK 1.2.16


    Native

        update	Added simple rewrite capability for IIS. Although simple it will fulfill most needs. (mturk)
        update	Added RECOVER_ABORT_IF_CLIENTERROR recovery_option that closes the connection if client connection is broken during the request. (mturk)
        update	Renamed cache_timeout directive to connection_pool_timeout. (mturk)
        update	Added connection_pool_minsize directive. (mturk)
        update	Deprecate recycle_timeout directive. (mturk)
        update	Corrected some HTML syntax bugs in output of status worker. (rjung)
        update	Added the refresh=n parameter to the status worker. It will update the display every n seconds. (rjung)
        update	Balancer: Add attribute distance to balanced workers to express preferences between workers. (rjung)
        update	Balancer: Add attribute jvm_route to balanced workers to be able to use the same target in different balancers. (rjung)
        update	Status: Add lb_mult to status. (rjung)
        update	Balancer: Make different balancing strategies work in a similar way (use lb_value, use decay during global maintenance, use integer factors for weights. (rjung)
        update	Balancer: Improve locking. (rjung)
        update	Balancer: Workers start slower after recovering. (rjung)
        update	Balancer: Make different balancing strategies work in a similar way (use lb_value, use decay during global maintenance, use integer factors lb_mult for weights). (rjung)
        update	Balancer: Move recovery check to global maintenance. (rjung)
        update	Balancer: Add global maintenance method, that is called in only one process. (rjung)
        update	Extend our use of autoconf to find a 32Bit and a 64Bit unsigned type and their printf formats. (rjung)
        update	Logging: piped loggers for JkLogFile and Apache 1.3. (rjung)
        update	Logging: Add PID to log lines for each log level apart from REQUEST. (rjung)
        update	Logging: flush buffered logs to keep lines in correct order. Output final newline together with log message. (rjung)
        update	Reducing shm size. (rjung)
        update	Only log removing of old worker, when we actually do it. (rjung)
        fix	37469: Fix shared memory close for forked childs. The shared memory will be closed by the parent process. (mturk)
        fix	37332: Fix potential misuse of buffer length with snprintf functions. (mturk)
        fix	38859: Protect mod_jk against buggy or malicious AJP servers in the backend. Patch provided by Ruediger Pluem. (mturk)
        fix	38889: Use worker map sorting depending on the path elements, to comply with Servlet spec. Patch provided by Steve Revilak. (mturk)
        update	36138: Added Busyness lb method. Patch provided by Chris Lamprecht. (mturk)
        fix	Fix pessimistic locking mode. The patch correctly handles the burst load, by syncing the access to the shared memory data. (mturk)
        fix	38806: Reclycle worker even if it is disabled. This fixes hot-standby workers in error state. (mturk)
        fix	37167: Allow building with BSD-ish like make. (mturk)
        fix	ISAPI plugin (isapi_redirect.dll) did not provide correct request data for IIS to include in the IIS log. (markt)

4 files changed, 14 insertions, 12 deletions

diff --git a/www/ap-jk/Makefile b/www/ap-jk/Makefile
index 96e9bfbcc6e..33a8f32129f 100644
--- a/www/ap-jk/Makefile
+++ b/www/ap-jk/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2006/07/22 19:41:34 abs Exp $
+# $NetBSD: Makefile,v 1.39 2006/11/15 11:04:04 abs Exp $
 
-DISTNAME=	jakarta-tomcat-connectors-${JK_VERSION}-src
+DISTNAME=	tomcat-connectors-${JK_VERSION}-src
 PKGNAME=	ap-jk-${JK_VERSION}
-PKGREVISION=	1
 
 MAKE_PARAMS+=		USE_APXS=1
 MAKE_PARAMS+=		WITH_APXS=${APXS}
diff --git a/www/ap-jk/Makefile.common b/www/ap-jk/Makefile.common
index 2ba45f79c6b..b0ce5dfab8f 100644
--- a/www/ap-jk/Makefile.common
+++ b/www/ap-jk/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.2 2006/10/14 08:24:59 wiz Exp $
+# $NetBSD: Makefile.common,v 1.3 2006/11/15 11:04:04 abs Exp $
 
-JK_VERSION=	1.2.15
+JK_VERSION=	1.2.19
 CATEGORIES=	www java
 MASTER_SITES=	http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-${JK_VERSION}/
 
@@ -13,7 +13,7 @@ CONFLICTS=	ap-jk-[0-9]*
 PATCHDIR=       ${.CURDIR}/../../www/ap-jk/patches
 DISTINFO_FILE=  ${.CURDIR}/../../www/ap-jk/distinfo
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/jk/native
+WRKSRC=		${WRKDIR}/${DISTNAME}/native
 APACHE_MODULE=	YES
 BUILD_DEFS+=	JK_ENABLE_JNI
 
diff --git a/www/ap-jk/distinfo b/www/ap-jk/distinfo
index e7a9fba9116..fe9ade001c4 100644
--- a/www/ap-jk/distinfo
+++ b/www/ap-jk/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2006/03/02 16:55:21 erh Exp $
+$NetBSD: distinfo,v 1.7 2006/11/15 11:04:04 abs Exp $
 
-SHA1 (jakarta-tomcat-connectors-1.2.15-src.tar.gz) = c9a67de4e03d6d7780cf0b14284f62d30bb78156
-RMD160 (jakarta-tomcat-connectors-1.2.15-src.tar.gz) = e5bce1ad604e9461ca4684a2c7ffffe1f2a7b667
-Size (jakarta-tomcat-connectors-1.2.15-src.tar.gz) = 722463 bytes
+SHA1 (tomcat-connectors-1.2.19-src.tar.gz) = 7e49c98000455ea226b16c45cf63fd565c2221eb
+RMD160 (tomcat-connectors-1.2.19-src.tar.gz) = f48895b847b84a77f95ec87faa47115b023f686f
+Size (tomcat-connectors-1.2.19-src.tar.gz) = 1246419 bytes
 SHA1 (patch-aa) = 27774432ecc82209e47beca24a54ef5139d4e2eb
 SHA1 (patch-ab) = 57e4ead1a73d9a47fb634d5c7fb18d49d0393a08
 SHA1 (patch-ac) = 14fdec1c921f369ee51a5d73a3bee3ec9056f07a
diff --git a/www/ap2-jk/Makefile b/www/ap2-jk/Makefile
index ce47839b9ae..062772570cd 100644
--- a/www/ap2-jk/Makefile
+++ b/www/ap2-jk/Makefile
@@ -1,8 +1,11 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/07/22 19:43:29 abs Exp $
+# $NetBSD: Makefile,v 1.2 2006/11/15 11:04:04 abs Exp $
 
-DISTNAME=	jakarta-tomcat-connectors-${JK_VERSION}-src
+DISTNAME=	tomcat-connectors-${JK_VERSION}-src
 PKGNAME=	ap2-jk-${JK_VERSION}
 
+MAKE_PARAMS+=		USE_APXS=1
+MAKE_PARAMS+=		WITH_APXS=${APXS}
+
 .include "../../www/ap-jk/Makefile.common"
 .include "../../www/apache2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"