Commit graph

39 commits

Author SHA1 Message Date
abs
f284e960bc 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)
2006-11-15 11:04:04 +00:00
abs
dc649954d7 ap-* should be using apache1 not apache2. Split out most of the Makefile
into Makefile.common to be used by upcoming ap2-jk package. Bump package
revision
2006-07-22 19:41:34 +00:00
joerg
4aa3ce2bb4 Needs libtool. 2006-06-08 12:15:12 +00:00
joerg
337c6b1297 Rename all PHP 4 packages to php4-*, all PHP 5 packages to php5-*,
all PEAR packages to php?-pear-* and all Apache packages to ap13-* or
ap2-* respectively. Add new variables to simplify the Makefile
handling. Add CONFLICTS on the old names. Reset revisions of bumped
packages. ap-php will now depend on the default Apache and PHP version.
All programs using it have an implicit option of the Apache version
as well.

OK from jlam@ and adrianp@.
2006-06-02 18:27:54 +00:00
rillig
9fc2d7d281 Removed the superfluous "quotes" and 'quotes' from variables that don't
need them, for example RESTRICTED and SUBST_MESSAGE.*.
2006-04-22 09:22:05 +00:00
joerg
5911def816 Recursive revision bump / recommended bump for gettext ABI change. 2006-02-05 23:08:03 +00:00
abs
742729af92 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)
2006-01-31 16:26:22 +00:00
wiz
768c589c29 Bump BUILDLINK_RECOMMENDED of textproc/expat to 2.0.0 because
of the shlib major bump.
PKGREVISION++ for the dependencies.
2006-01-24 07:31:52 +00:00
schmonz
42428df5a0 Express these packages' brokenness with BROKEN_IN=pkgsrc-2005Q4
rather than PKG_FAIL_REASON, so that they provide useful error
messages in build logs, and so that they continue to work on platforms
where they aren't broken.
2006-01-04 04:29:05 +00:00
schmonz
463f43526a Mark packages for pkgsrc-2005Q4 that don't build on NetBSD/i386
3.0. If one of these is important to you, please fix it in time
for pkgsrc-2006Q1, or it may be removed.
2005-12-26 23:39:30 +00:00
rillig
579e977969 Ran "pkglint --autofix", which corrected some of the quoting issues in
CONFIGURE_ARGS.
2005-12-05 23:55:01 +00:00
jlam
585534220c Remove USE_GNU_TOOLS and replace with the correct USE_TOOLS definitions:
USE_GNU_TOOLS	-> USE_TOOLS
	awk		-> gawk
	m4		-> gm4
	make		-> gmake
	sed		-> gsed
	yacc		-> bison
2005-05-22 20:07:36 +00:00
tv
f816d81489 Remove USE_BUILDLINK3 and NO_BUILDLINK; these are no longer used. 2005-04-11 21:44:48 +00:00
erh
94955afb16 Fix build when using apache-1.3. Set maintainer to me. 2005-04-08 01:21:47 +00:00
erh
f5d11200cc Update www/ap_jk to 1.2.8. 2005-03-30 16:41:47 +00:00
jlam
5e5ac5cef9 USE_BUILDLINK3 is a yes/no variable. 2004-11-13 21:28:27 +00:00
wiz
6c06d9bfcf Convert to buildlink3. 2004-07-02 22:01:01 +00:00
abs
ec72d81781 Fix BUILD_DEPENDS on gtar-base to gtar-base-[0-9]*
No change of built package (if it built before).
2004-01-27 18:56:43 +00:00
agc
3ad1bdbf06 Move WRKSRC definition away from the first paragraph in a Makefile. 2004-01-20 12:18:15 +00:00
cjep
1b39677b6e Remove unnecessary blank lines. 2004-01-12 09:46:04 +00:00
jschauma
cffa35af85 Add pseudo-category 'java'. 2003-08-23 15:16:36 +00:00
grant
ca3be631f2 s/netbsd.org/NetBSD.org/ 2003-07-17 22:50:55 +00:00
jmmv
0916498c1b Place WRKSRC where it belongs, to make pkglint happy; ok'ed by wiz. 2003-03-29 12:40:00 +00:00
grant
8894f54ec8 use apache/module.mk. 2003-02-17 23:05:48 +00:00
grant
d149430d22 workaround pax-as-tar problem in -current by using gnutar to extract
the distfile.
2003-02-17 23:04:36 +00:00
jlam
338e27bd07 Separate out version number into TOMCAT_VERSION and use it everywhere
instead of hardcoding the version number.  Also use apxs to do the
installation of the shared module.
2002-12-28 20:50:21 +00:00
jlam
a0712b80ae Move java.mk to java-vm.mk to avoid name conflict with devel/mk-files as
suggested by Simon J. Gerraty.
2002-12-26 20:52:09 +00:00
jlam
c25ee6ba99 Use buildlink2 and java.mk. 2002-10-18 21:54:08 +00:00
jlam
04c8f5b996 Use PKG_JAVA_HOME consistently instead of JAVA_HOME now that JAVA_HOME is
no longer defined by bsd.pkg.mk.
2002-10-10 01:01:09 +00:00
jlam
e8398f5238 Set USE_JAVA=run on some packages that obviously don't need a JDK for the
build.  These packages set NO_BUILD and by inspection of the Makefiles,
there isn't any invocation of java needed.
2002-07-29 22:23:25 +00:00
jlam
e1be891dbc Change explicit build dependencies on perl into "USE_PERL5=build". This
makes these packages build correctly on Darwin where perl>=5.8.0 is
required.
2002-07-24 19:45:22 +00:00
jwise
60715496a9 Update jakarta-servletapi, jakarta-tomcat, and ap-jk to version 3.2.4.
We are not advancing to the 3.3 or 4.0 branches at the moment, as neither
will work with our native JDK without a lot more work.

Changes since Tomcat 3.2.3 (the last pkgsrc version):

7.1 Fixes and Enhancements in Release 3.2.4

This section highlights the bugs fixed in this release.

  -  Cookie name expires is a reserved token (#1114)
  -  Thread initialization problem in thread pool (#1745)
  -  AJP12 returned invalid HTTP headers when redirecting to very
     long URLS (#2333)
  -  Fixed casting problem in JspFactoryImpl.getPageContext().  (#4260)
  -  Setting sesstion-timeout in web.xml did not prevent sessions from
     timing out.  (#4412)
  -  Fixed race condition in ServerSocketFactory.getDefault().  (#4418)
  -  Removed the restrictions on encoded spcecial characters in URLs
     that was added as a security precaution in 3.2.3.  The encoded
     special characters are not decoded and remain the URL and
     path info returned to servlets.
  -  Jk_nt_service now supports the ability to be restarted automatically
     by the Windows 2000 service control manager if Tomcat terminates
     abnormally.
  -  Fixed invalid servlet mapping in web.xml generated by JspC (#3474, #3499)
  -  Added findResource() and findResources() to AdaptiveClassLoader12
  -  A Date: HTTP header is now sent in responses when running stand
     alone. (#345)
  -  Simple held on to a reference to removed objects preventing
     garbage collection.
  -  Tomcat 3.2.4 now ships with JAXP 1.1.  Prior releases used
     JAXP 1.0.1.  Tomcat 3.2.4 remains completely compatible with
     the older version of JAXP and there is no requirement for users
     to upgrade to JAXP 1.1 unless their applications require the new
     version.
  -  Fixed NullPointerException in HttpConnectionHandler.  (#4577)


7.2 Security Vulnerabilities fixed in Tomcat 3.2.4

The randomness of generated session ids has been enhanced to prevent the
generation of guessable ids.
2002-04-19 15:54:20 +00:00
jlam
e48eed927a Note that these modules only work with Apache 1.3.* and not the forthcoming
Apache 2.x servers.
2002-02-28 18:32:18 +00:00
jlam
f79573370a Mechanical changes to 375 files to change dependency patterns of the form
foo-* to foo-[0-9]*.  This is to cause the dependencies to match only the
packages whose base package name is "foo", and not those named "foo-bar".
A concrete example is p5-Net-* matching p5-Net-DNS as well as p5-Net.  Also
change dependency examples in Packages.txt to reflect this.
2001-09-27 23:17:41 +00:00
jonb
6c1b257916 Make all the ap-* packages work with apache6 as well as apache
(except for ap-ssl, of course)
2001-05-20 05:23:26 +00:00
jlam
785502875b USE_PERL is not the correct name of the variable. Remove it anyway and
properly add a build depend on perl so that Apache's apxs will work.
2001-05-12 15:01:45 +00:00
hubertf
28b9afe670 Make this pkg build with sun-jre/jdk: it comes with a include/linux dir,
so we need to set -I to get the headers there. (There's some
-I.../include/netbsd already, i guess that's for a NetBSD-native JDK or
something, not touching that one).

Adresses PR 12571 by Omar Asfour <oasfour@email.com>
2001-04-27 14:22:18 +00:00
wiz
6dcc5bf4a8 Drop remaining uses of DIGEST_FILE (which were bogus, anyway) 2001-04-21 13:42:38 +00:00
jwise
cfa21cb8f8 Initial import of ap-jk-3.2.1, the next generation connector for accessing
Jakarta Tomcat of JServ from Apache.

Some more information:

What is mod_jk?

mod_jk is a replacement to the elderly mod_jserv. It is a completely
new Tomcat-Apache plugin that handles the communication between
Tomcat and Apache

Why mod_jk?

Several reasons:

mod_jserv was too complex. Because it was ported from Apache/JServ,
it brought with it lots of JServ specific bits that aren't needed
by Apache.

mod_jserv supported only Apache. Tomcat supports many web servers
through a compatibility layer named the jk library. Supporting two
different modes of work became problematic in terms of support,
documentation and bug fixes. mod_jk should fix that.

The layered approach provided by the jk library makes it easier to
support both Apache1.3.x and Apache2.xx.

Better support for SSL. mod_jserv couldn't reliably identify whether
a request was made via HTTP or HTTPS. mod_jk can, using the newer
Ajpv13 protocol.
2001-03-29 19:34:18 +00:00