update www/ap-jk to 1.2.15

Changes from the released JK 1.2.14
    Native
        fix Fix lb for worker mpm's with cachesize set to lower
            number then ThreadsPerChild is. If retries is set to
            value larger then 3 sleep for 100 ms on each attempt.
            This enables to tune the connection cache, and
            serialize incoming connections instead returning busy
            if connection count is larger then cachesize. (mturk)
        fix 36525: Solaris core dump. (mturk)
        fix 36102: Worker actions do not persist. (mturk)
        fix 35864: Status worker doesn't list workers. Patch
            provided by Martin Goldhahn. (mturk)
        fix 35809: JkMountCopy don't work for Apache 2.0 Patch
            provided by Christophe Dubach. (mturk)
        fix 35298: Multiple JK/ISAPI redirectors on a single IIS
            site are not supported Patch provided by Tim
            Whittington. (mturk)

Changes from the released JK 1.2.13
    Native
        fix    34397: Emergency was handled as Error. (jfclere)
        fix    34474: // in URL were not handled correctly with
               Apache-1.3. (jfclere)
        fix    Use 64 bits int for transferred/read bytes.
        update Added JkOptions +FlushPackets used to optimize
               memory usage when sending large data. (mturk)
        update Added lock directive for load balancer that allows
               more acurate load balancing in case of burst load.
               (mturk)
        update Added worker.maintain directive to allow
               customizing default 10 second timeout. On busy
               servers this value needs to be set on higher value.
               (mturk)
        fix    Fix for NetWare compiler to deal with different
               types between AP13 and AP2 SDKs. (fuankg)
        update Emit much more legible user.dmp crash analysis
               output for WIN32. (wrowe)
        fix    34558: Fix first failover request. (mturk)

Changes from the released JK 1.2.12
    Native
        update Added ForwardLocallAddres JkOptions flag for
               passing local instead remote address. Useful for
               remote addr valve. (mturk)
        fix    Fix that worker not used, when stopped flag is
               true. (pero)
        update Add loadbalance default worker secret attribute to
               the documentation (pero)

Changes from the released JK 1.2.11
    Native
        fix    Backport SC_M_JK_STORED from JK2 for passing
               arbitrary methods instead failing the request.
               (mturk)
        fix    Added missing SEARCH and ACL http methods. (mturk)
        update Add worker secret attribute to the documentation
               (pero)
        update Add a stopped flag to worker configuration. Set
               flag True and complete traffic to worker is
               stopped. Also update the Ant JkStatusUpdateTask at
               Tomcat 5.5.10 release. Only usefull in a replicated
               session cluster.(pero)
        update Added worker maintain function that will maintain
               all the workers instead just the current one. This
               enables to recycle the connections on all workers.
               (mturk)
        update Use shutdown when recycling connections instead
               hard breaking the socket. (mturk)
        update Add unique directives checking. The directives if
               unique are now overwritten instead concatenated.
               (mturk)
        update Allow multiple worker.list directives. (mturk)
        fix    34577: For IIS log original request instead loging
               the request for ISAPI extension. (mturk)
        fix    34558: Make sure the returned status codes are the
               same for ajp and lb workers. (mturk)
        fix    34423: Use APR_USE_FLOCK_SERIALIZE for setting log
               lock on platforms like FreeBSD. Patch provided by
               Allan Saddi. (mturk)
        fix    33843: Fix obtaining LDFLAGS that were used for
               building Apache HTTPD. Patch provided by Beat
               Kneubuehl. (mturk)
        fix    34358: Enable load balancer method configuration.
               (glenn)
        fix    34357: In some situations Apache 2 mod_jk could
               segfault when the JkAutoAlias directive is used.
               (glenn)
        update Add --enable-prefork to the documentation (pero)

Changes from the released JK 1.2.10
    Native
        update Set default shared memory to 64K instead 1M.
               (mturk)
        fix    Do not mark the worker in error state if headers
               are larger then AJP13 limit. (mturk)
        update On Series you should use the latest PTF for Apache
               2.0 (which is now 2.0.52) and ad minima SI17402/
               SI17061 or cumulative including them. (hgomez)
        update Change the xml status format to xml attribute
               syntax (pero)
        fix    33248: Fix builds where apxs defines multiple
               directories for APR includes. (mturk)
        fix    32696: Return 404 instead 403 when WEB-INF is
               requested to comply with Servlet spec. (mturk)
        update Added ANT task for managing jkstatus. (pero)
        update If socket_timeout is set, check if socket is alive
               before sending any request to Tomcat. (mturk)
        update Added JkMountFile for Apache web servers. This file
               can contain uri mappings in the form (/url=worker),
               and is checked for updates at regular 60 second
               interval. (mturk)
        update Added status worker for managing worker runtime
               data using web page. (mturk)
        update Added load balancer method directive that is used
               for setting the algorithm used for balancing
               workers. Method can be either Request (default) or
               Traffic. (mturk)
        update Added shared memory to allow dynamic configuration.
               Shared memory is needed only for unix platform and
               web servers having multiple child processes. For
               Apache web server two new directives has been added
               (JkShmFile and JkShmSize). (mturk)
        update Added textupdate mode to status worker to handle
               remote updates from ant tasks.(pero)
        fix    33562: Fix Reply_timeout when recovery_options is
               larger than 1. Patch provided by Takashi Satou.
               (mturk)
        fix    33308: Fix segfaults when ForwardDirectories is
               enabled with Apache 1.3

Changes from the released JK 1.2.8
    Native
        update Allow anyone to debug and diagnose stack dumps
               using windbg or any other debugging tool, and (if
               they add the .pdb files to their installation) to
               make sense of dr watson logs. Patch provided by
               William A. Rowe (wrowe)
        fix    Fix in_addr_t usage by using the real struct
               ignoring typedef. Patch provided by William A. Rowe
               (wrowe)
        fix    Fix url rewriting by restoring the in place uri
               from which the jsessionid was removed. (mturk)
        update Make load balancer algorithm thread safe by
               introducing mutex to the load balancer worker.
               (mturk)
        fix    Fix sending error pages for IIS to client by adding
               Content-Type header using correct api function
               call. (mturk)
        fix    32696: Prevent IIS from crushing when web-inf url
               was requested. (mturk)
        update Use default cachesize for servers that support
               discovering the number of threads per child
               process. (mturk).
        fix    Fix Apache content-length header parsing using case
               insensitive compare. (billbarker)
        fix    Fix parsing AJP headers using case insensitive
               compare. (mturk)
        fix    Use infinite socket timeout if socket_timeout is
               set to zero or less then zero. (mturk)
        update Change balanced_workers to balance_workers but keep
               backward compatibility preserving the old
               directive. (mturk).
        fix    Fix ajp initialization for workers with cache_size
               set to zero. (mturk)
        update 32317: Making mod_jk replication aware (Clustering
               Support). Patch provided by Rainer Jung. (mturk).
        fix    31132: Core dump when JkLogFile is missing from
               conf. (mturk)

3 files changed, 14 insertions, 17 deletions

diff --git a/www/ap-jk/Makefile b/www/ap-jk/Makefile
index 2a8bc9615e1..d06baef624a 100644
--- a/www/ap-jk/Makefile
+++ b/www/ap-jk/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.32 2006/01/24 07:32:42 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2006/01/31 16:26:22 abs Exp $
 
 DISTNAME=	jakarta-tomcat-connectors-${JK_VERSION}-src
 PKGNAME=	ap-jk-${JK_VERSION}
-JK_VERSION=	1.2.8
-PKGREVISION=	1
+JK_VERSION=	1.2.15
 CATEGORIES=	www java
 MASTER_SITES=	http://www.apache.org/dist/jakarta/tomcat-connectors/jk/source/jk-${JK_VERSION}/
 
@@ -11,9 +10,7 @@ MAINTAINER=	erh@NetBSD.org
 HOMEPAGE=	http://jakarta.apache.org/tomcat/connectors-doc/
 COMMENT=	Apache connector for accessing Jakarta Tomcat
 
-BROKEN_IN=	pkgsrc-2005Q4
-
-WRKSRC=			${WRKDIR}/${DISTNAME}/jk/native
+WRKSRC=		${WRKDIR}/${DISTNAME}/jk/native
 APACHE_MODULE=	YES
 BUILD_DEFS+=	JK_ENABLE_JNI
 
diff --git a/www/ap-jk/distinfo b/www/ap-jk/distinfo
index f19b9807007..ca6eb58bd01 100644
--- a/www/ap-jk/distinfo
+++ b/www/ap-jk/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2005/03/30 16:41:47 erh Exp $
+$NetBSD: distinfo,v 1.5 2006/01/31 16:26:22 abs Exp $
 
-SHA1 (jakarta-tomcat-connectors-1.2.8-src.tar.gz) = 3add398066c667cc8cbce05bf277e06550cf7f35
-RMD160 (jakarta-tomcat-connectors-1.2.8-src.tar.gz) = a4d12a11094125f2d7c78a6c679dec43a454d6ad
-Size (jakarta-tomcat-connectors-1.2.8-src.tar.gz) = 798199 bytes
-SHA1 (patch-aa) = dd1405e6f7ecdfebf3bfc7e71cf27d33423f48d4
+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 (patch-aa) = 27774432ecc82209e47beca24a54ef5139d4e2eb
 SHA1 (patch-ab) = 57e4ead1a73d9a47fb634d5c7fb18d49d0393a08
 SHA1 (patch-ac) = 14fdec1c921f369ee51a5d73a3bee3ec9056f07a
diff --git a/www/ap-jk/patches/patch-aa b/www/ap-jk/patches/patch-aa
index dbba0af9ed6..ca877265397 100644
--- a/www/ap-jk/patches/patch-aa
+++ b/www/ap-jk/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.3 2005/03/30 16:41:47 erh Exp $
+$NetBSD: patch-aa,v 1.4 2006/01/31 16:26:22 abs Exp $
 
---- common/jk_util.c.orig	2005-03-29 15:00:30.000000000 -0600
-+++ common/jk_util.c	2005-03-29 15:00:33.000000000 -0600
-@@ -1071,7 +1071,7 @@
-     pthread_getunique_np(&t, &tid);      
- 	return ((int)(tid.intId.lo & 0xFFFFFFFF));
+--- common/jk_util.c.orig	2005-07-01 16:41:08.000000000 +0100
++++ common/jk_util.c
+@@ -1242,7 +1242,7 @@ int jk_gettid()
+     pthread_getunique_np(&t, &tid);
+     return ((int)(tid.intId.lo & 0xFFFFFFFF));
  #else
 -    int tid = (int)(t & 0xFFFF);
 +	int tid = (int)t;