[Bug 56189] New: Remove cpappend.bat
https://issues.apache.org/bugzilla/show_bug.cgi?id=56189 Bug ID: 56189 Summary: Remove cpappend.bat Product: Tomcat 8 Version: trunk Hardware: All OS: All Status: NEW Severity: trivial Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: ognjen.d.blagoje...@gmail.com File bin/cpappend.bat seems to be needless. It is not called from any other script in bin/ directory. I assume it was used as a helper script to create classpath dynamically, but that is not necessery any more. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[VOTE] Release Apache Tomcat Connectors 1.2.38
Hi, Apache Tomcat Connectors 1.2.38 release candidate is ready for vote at [1]. This version fixes few bugs found in released version 1.2.37 and adds some new features like IPV6 support. The VOTE will remain open for at least 48 hours. The Apache Tomcat Connectors 1.2.38 is [ ] Stable, go ahead and release [ ] Broken because of ... [1] http://people.apache.org/~mturk/tomcat-connectors/jk-1.2.38/ Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat Connectors 1.2.38
On 02/26/2014 09:45 AM, Mladen Turk wrote: Hi, Apache Tomcat Connectors 1.2.38 release candidate is ready for vote at [1]. This version fixes few bugs found in released version 1.2.37 and adds some new features like IPV6 support. The VOTE will remain open for at least 48 hours. The Apache Tomcat Connectors 1.2.38 is [ ] Stable, go ahead and release [ ] Broken because of ... With httpd-2.2.21 on fedora20: +++ /home/jfclere/APACHE-2.2.21/build/libtool --silent --mode=compile gcc -I/home/jfclere/APACHE-2.2.21/include -DHAVE_CONFIG_H -ansi -pedantic -Wno-long-long -Wall -pthread -DHAVE_APR -I/home/jfclere/APACHE-2.2.21/include -I/home/jfclere/APACHE-2.2.21/include -DHAVE_CONFIG_H -D_REENTRANT -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -c jk_lb_worker.c -o jk_lb_worker.lo jk_lb_worker.c: In function ‘get_sessionid’: jk_lb_worker.c:516:5: error: expected expression before ‘/’ token // set session_path ^ jk_lb_worker.c:519:5: error: expected expression before ‘/’ token // set session_cookie ^ make[1]: *** [jk_lb_worker.lo] Error 1 +++ Cheers Jean-Frederic - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat Connectors 1.2.38
On 02/26/2014 09:55 AM, jean-frederic clere wrote: On 02/26/2014 09:45 AM, Mladen Turk wrote: +++ /home/jfclere/APACHE-2.2.21/build/libtool --silent --mode=compile gcc -I/home/jfclere/APACHE-2.2.21/include -DHAVE_CONFIG_H -ansi -pedantic -Wno-long-long -Wall -pthread -DHAVE_APR -I/home/jfclere/APACHE-2.2.21/include -I/home/jfclere/APACHE-2.2.21/include -DHAVE_CONFIG_H -D_REENTRANT -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -c jk_lb_worker.c -o jk_lb_worker.lo jk_lb_worker.c: In function ‘get_sessionid’: jk_lb_worker.c:516:5: error: expected expression before ‘/’ token // set session_path ^ jk_lb_worker.c:519:5: error: expected expression before ‘/’ token // set session_cookie ^ make[1]: *** [jk_lb_worker.lo] Error 1 +++ get rid of '-pedentic' compiler flag. This was applied by Rainer back in 2011 so we had few releases with that code already. Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1571978 - /tomcat/jk/trunk/native/common/jk_lb_worker.c
Author: jfclere Date: Wed Feb 26 09:33:51 2014 New Revision: 1571978 URL: http://svn.apache.org/r1571978 Log: arrange the JAVA comments. Modified: tomcat/jk/trunk/native/common/jk_lb_worker.c Modified: tomcat/jk/trunk/native/common/jk_lb_worker.c URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_lb_worker.c?rev=1571978&r1=1571977&r2=1571978&view=diff == --- tomcat/jk/trunk/native/common/jk_lb_worker.c (original) +++ tomcat/jk/trunk/native/common/jk_lb_worker.c Wed Feb 26 09:33:51 2014 @@ -513,10 +513,10 @@ static char *get_sessionid(jk_ws_service return val; } -// set session_path +/* set session_path */ session_path = (s->extension.session_path) ? s->extension.session_path : p->session_path; -// set session_cookie +/* set session_cookie */ session_cookie = (s->extension.session_cookie) ? s->extension.session_cookie : p->session_cookie; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat Connectors 1.2.38
On 26.02.2014 09:45, Mladen Turk wrote: > Hi, > > Apache Tomcat Connectors 1.2.38 release candidate is ready > for vote at [1]. This version fixes few bugs found in released > version 1.2.37 and adds some new features like IPV6 support. > > > The VOTE will remain open for at least 48 hours. > > The Apache Tomcat Connectors 1.2.38 is > [ ] Stable, go ahead and release > [ ] Broken because of ... > > > > [1] http://people.apache.org/~mturk/tomcat-connectors/jk-1.2.38/ In jk_version.h the define for JK_VERISRELEASE is 0, which means the version strings will say 1.2.38-rc-0 instead of 1.2.38. No other finding currently, but still checking some stuff. Just wanted to let you know quickly. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat Connectors 1.2.38
On 02/26/2014 11:18 AM, Rainer Jung wrote: No other finding currently, but still checking some stuff. Just wanted to let you know quickly. OK. Give it a try. I'll just retag 1.2.39 with all the "polishing" stuff found. It's been a while since last release, so I was prepared for few runs :) Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1572023 - /tomcat/jk/trunk/native/common/jk_connect.c
Author: rjung Date: Wed Feb 26 11:50:34 2014 New Revision: 1572023 URL: http://svn.apache.org/r1572023 Log: Partially fix obsolete comment. Modified: tomcat/jk/trunk/native/common/jk_connect.c Modified: tomcat/jk/trunk/native/common/jk_connect.c URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_connect.c?rev=1572023&r1=1572022&r2=1572023&view=diff == --- tomcat/jk/trunk/native/common/jk_connect.c (original) +++ tomcat/jk/trunk/native/common/jk_connect.c Wed Feb 26 11:50:34 2014 @@ -1184,7 +1184,7 @@ static const char *inet_ntop6(const unsi #endif /** - * dump a sockaddr_in in A.B.C.D:P in ASCII buffer + * dump a jk_sockaddr_t in A.B.C.D:P in ASCII buffer * */ char *jk_dump_hinfo(jk_sockaddr_t *saddr, char *buf) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1572024 - in /tomcat/jk/trunk/native/common: jk_ajp12_worker.c jk_ajp_common.c
Author: rjung
Date: Wed Feb 26 11:50:56 2014
New Revision: 1572024
URL: http://svn.apache.org/r1572024
Log:
Be more explicit with default for prefer_ipv6.
Modified:
tomcat/jk/trunk/native/common/jk_ajp12_worker.c
tomcat/jk/trunk/native/common/jk_ajp_common.c
Modified: tomcat/jk/trunk/native/common/jk_ajp12_worker.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_ajp12_worker.c?rev=1572024&r1=1572023&r2=1572024&view=diff
==
--- tomcat/jk/trunk/native/common/jk_ajp12_worker.c (original)
+++ tomcat/jk/trunk/native/common/jk_ajp12_worker.c Wed Feb 26 11:50:56 2014
@@ -192,7 +192,7 @@ static int JK_METHOD validate(jk_worker_
p->name, host, port);
if (host) {
-if (jk_resolve(host, port, &p->worker_inet_addr, we->pool, 0, l)) {
+if (jk_resolve(host, port, &p->worker_inet_addr, we->pool,
JK_FALSE, l)) {
return JK_TRUE;
}
jk_log(l, JK_LOG_ERROR,
Modified: tomcat/jk/trunk/native/common/jk_ajp_common.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_ajp_common.c?rev=1572024&r1=1572023&r2=1572024&view=diff
==
--- tomcat/jk/trunk/native/common/jk_ajp_common.c (original)
+++ tomcat/jk/trunk/native/common/jk_ajp_common.c Wed Feb 26 11:50:56 2014
@@ -2730,7 +2730,7 @@ int ajp_validate(jk_worker_t *pThis,
host = "undefined";
}
strncpy(p->host, jk_get_worker_host(props, p->name, host),
JK_SHM_STR_SIZ);
-p->prefer_ipv6 = jk_get_worker_prefer_ipv6(props, p->name, 0);
+p->prefer_ipv6 = jk_get_worker_prefer_ipv6(props, p->name, JK_FALSE);
if (p->s->h.sequence == 0) {
/* Initial setup.
*/
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1572028 - /tomcat/jk/trunk/native/configure.in
Author: rjung
Date: Wed Feb 26 12:06:59 2014
New Revision: 1572028
URL: http://svn.apache.org/r1572028
Log:
An empty if-given block in AC_ARG_ENABLE
for sock-cloexec would disable SOCK_CLOEXEC
in both cases, "--disable-sock-cloexec"
and "--enable-sock-cloexec".
Support the theoretical "--enable-sock-cloexec"
case by checking enableval like we do for
other cases. Enable is now doing auto-detection,
the same as was the default (no switch given) before.
Modified:
tomcat/jk/trunk/native/configure.in
Modified: tomcat/jk/trunk/native/configure.in
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/configure.in?rev=1572028&r1=1572027&r2=1572028&view=diff
==
--- tomcat/jk/trunk/native/configure.in (original)
+++ tomcat/jk/trunk/native/configure.in Wed Feb 26 12:06:59 2014
@@ -370,6 +370,12 @@ AC_ARG_ENABLE(sock-cloexec,
[AS_HELP_STRING([--disable-sock-cloexec],[Disable use of SOCK_CLOEXEC.
This ensures the built module can be used on systems that do not support
SOCK_CLOEXEC])],
[
+case "${enableval}" in
+y | Y | YES | yes | TRUE | true )
+ dnl check for SOCK_CLOEXEC
+ JK_CHECK_SOCKOPT(SOCK_CLOEXEC)
+;;
+esac
],
[
dnl check for SOCK_CLOEXEC
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1572031 - in /tomcat/jk/trunk: HOWTO-RELEASE.txt native/BUILDING.txt native/configure.ac native/configure.in
Author: rjung Date: Wed Feb 26 12:29:31 2014 New Revision: 1572031 URL: http://svn.apache.org/r1572031 Log: Rename configure.in to configure.ac. auto tools complain now about configure.in name and configure.ac is preferred since many years. Added: tomcat/jk/trunk/native/configure.ac - copied unchanged from r1572028, tomcat/jk/trunk/native/configure.in Removed: tomcat/jk/trunk/native/configure.in Modified: tomcat/jk/trunk/HOWTO-RELEASE.txt tomcat/jk/trunk/native/BUILDING.txt Modified: tomcat/jk/trunk/HOWTO-RELEASE.txt URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/HOWTO-RELEASE.txt?rev=1572031&r1=1572030&r2=1572031&view=diff == --- tomcat/jk/trunk/HOWTO-RELEASE.txt (original) +++ tomcat/jk/trunk/HOWTO-RELEASE.txt Wed Feb 26 12:29:31 2014 @@ -44,7 +44,7 @@ Check version numbers in the files that "Update source for next version" below: native/STATUS.txt -native/configure.in +native/configure.ac native/common/jk_version.h native/iis/installer/isapi-redirector-win32-msi.ism xdocs/miscellaneous/changelog.xml @@ -155,7 +155,7 @@ Update source for next version native/STATUS.txt: Add release date for released version and status "in development" for new version. -native/configure.in: Update variable VERSION. +native/configure.ac: Update variable VERSION. native/common/jk_version.h: Update variables JK_VERMAJOR, JK_VERMINOR, JK_VERFIX, JK_VERSTRING, and JK_VERISRELEASE. native/iis/installer/isapi-redirector-win32-msi.ism: Update ProductVersion. Modified: tomcat/jk/trunk/native/BUILDING.txt URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/BUILDING.txt?rev=1572031&r1=1572030&r2=1572031&view=diff == --- tomcat/jk/trunk/native/BUILDING.txt (original) +++ tomcat/jk/trunk/native/BUILDING.txt Wed Feb 26 12:29:31 2014 @@ -142,7 +142,7 @@ - libtool files in scripts/build/unix (should copy them?) - Makefile.in from Makefile.am - aclocal.m4 from different m4 files located on the local machine - - configure from configure.in and aclocal.m4 + - configure from configure.ac and aclocal.m4 buildconf.sh is known to work with libtool 1.5.2, automake 1.10 and autoconf 2.59 or newer. The use of more recent versions is - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1572035 - /tomcat/jk/trunk/native/configure.ac
Author: rjung
Date: Wed Feb 26 12:52:05 2014
New Revision: 1572035
URL: http://svn.apache.org/r1572035
Log:
Fix another auto tools warning by switching to
the recommened macro use for auto tools initialization.
I couldn't make the variable sytnax work though
but since they were only used on the following line,
using verbatim values should be OK.
Modified:
tomcat/jk/trunk/native/configure.ac
Modified: tomcat/jk/trunk/native/configure.ac
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/configure.ac?rev=1572035&r1=1572034&r2=1572035&view=diff
==
--- tomcat/jk/trunk/native/configure.ac (original)
+++ tomcat/jk/trunk/native/configure.ac Wed Feb 26 12:52:05 2014
@@ -18,17 +18,19 @@ dnl Process this file with autoconf to p
dnl
AC_REVISION($Id$)dnl
-AC_PREREQ(2.13)
-AC_INIT(common/jk_worker.h)
+dnl Minimum autoconf version
+AC_PREREQ(2.59)
+
+dnl package and version.
+dnl synchronization with common/jk_version.h ?
+AC_INIT([mod_jk], [1.2.38])
+
+AC_CONFIG_SRCDIR([common/jk_worker.h])
AC_CONFIG_HEADER(common/config.h)
AC_CONFIG_AUX_DIR(scripts/build/unix)
AC_CANONICAL_SYSTEM
-dnl package and version. (synchronization with common/jk_version.h ?)
-PACKAGE=mod_jk
-VERSION=1.2.38
-
-AM_INIT_AUTOMAKE(${PACKAGE}, ${VERSION})
+AM_INIT_AUTOMAKE
dnl
dnl Include our own M4 macros
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1572038 - in /tomcat/jk/trunk/native/scripts/build/unix: config.guess config.sub
Author: rjung
Date: Wed Feb 26 12:57:07 2014
New Revision: 1572038
URL: http://svn.apache.org/r1572038
Log:
Update config.{guess,sub} from
http://git.savannah.gnu.org/gitweb/?p=config.git.
Modified:
tomcat/jk/trunk/native/scripts/build/unix/config.guess
tomcat/jk/trunk/native/scripts/build/unix/config.sub
Modified: tomcat/jk/trunk/native/scripts/build/unix/config.guess
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/scripts/build/unix/config.guess?rev=1572038&r1=1572037&r2=1572038&view=diff
==
--- tomcat/jk/trunk/native/scripts/build/unix/config.guess (original)
+++ tomcat/jk/trunk/native/scripts/build/unix/config.guess Wed Feb 26 12:57:07
2014
@@ -1,8 +1,8 @@
#! /bin/sh
# Attempt to guess a canonical system name.
-# Copyright 1992-2013 Free Software Foundation, Inc.
+# Copyright 1992-2014 Free Software Foundation, Inc.
-timestamp='2013-06-10'
+timestamp='2014-02-12'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -50,7 +50,7 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright 1992-2013 Free Software Foundation, Inc.
+Copyright 1992-2014 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -149,7 +149,7 @@ Linux|GNU|GNU/*)
LIBC=gnu
#endif
EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's,
,,g'`
;;
esac
@@ -1260,16 +1260,26 @@ EOF
if test "$UNAME_PROCESSOR" = unknown ; then
UNAME_PROCESSOR=powerpc
fi
- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
- if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
- grep IS_64BIT_ARCH >/dev/null
- then
- case $UNAME_PROCESSOR in
- i386) UNAME_PROCESSOR=x86_64 ;;
- powerpc) UNAME_PROCESSOR=powerpc64 ;;
- esac
+ if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif')
| \
+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+ grep IS_64BIT_ARCH >/dev/null
+ then
+ case $UNAME_PROCESSOR in
+ i386) UNAME_PROCESSOR=x86_64 ;;
+ powerpc) UNAME_PROCESSOR=powerpc64 ;;
+ esac
+ fi
fi
+ elif test "$UNAME_PROCESSOR" = i386 ; then
+ # Avoid executing cc on OS X 10.9, as it ships with a stub
+ # that puts up a graphical alert prompting to install
+ # developer tools. Any system running Mac OS X 10.7 or
+ # later (Darwin 11 and later) is required to have a 64-bit
+ # processor. This is not true of the ARM version of Darwin
+ # that Apple uses in portable devices.
+ UNAME_PROCESSOR=x86_64
fi
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
exit ;;
@@ -1361,154 +1371,6 @@ EOF
exit ;;
esac
-eval $set_cc_for_build
-cat >$dummy.c <
-# include
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
- /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed,
- I don't know */
- printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include
- printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
- "4"
-#else
- ""
-#endif
- ); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
- printf ("arm-acorn-riscix\n"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
- printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
- int version;
- version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
- if (version < 4)
-printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
- else
-printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
- exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
- printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
- printf ("ns32k-encore-mach\n"); exit (0);
-#else
- printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
- printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
- printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
- printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
Re: svn commit: r1572035 - /tomcat/jk/trunk/native/configure.ac
On 02/26/2014 01:52 PM, rj...@apache.org wrote: Author: rjung -AC_PREREQ(2.13) -AC_INIT(common/jk_worker.h) +dnl Minimum autoconf version +AC_PREREQ(2.59) + Any reason why? Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1572035 - /tomcat/jk/trunk/native/configure.ac
On 02/26/2014 02:03 PM, Mladen Turk wrote: On 02/26/2014 01:52 PM, rj...@apache.org wrote: Author: rjung -AC_PREREQ(2.13) -AC_INIT(common/jk_worker.h) +dnl Minimum autoconf version +AC_PREREQ(2.59) + Any reason why? Nevermind. 2.59 is old enough for supported platforms. Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1572035 - /tomcat/jk/trunk/native/configure.ac
On 26.02.2014 14:06, Mladen Turk wrote: > On 02/26/2014 02:03 PM, Mladen Turk wrote: >> On 02/26/2014 01:52 PM, rj...@apache.org wrote: >>> Author: rjung >>> >>> -AC_PREREQ(2.13) >>> -AC_INIT(common/jk_worker.h) >>> +dnl Minimum autoconf version >>> +AC_PREREQ(2.59) >>> + >> >> Any reason why? >> > > Nevermind. 2.59 is old enough for supported platforms. Right, I also checked which one you were using. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat Connectors 1.2.38
On 26.02.2014 11:48, Mladen Turk wrote: > On 02/26/2014 11:18 AM, Rainer Jung wrote: >> >> No other finding currently, but still checking some stuff. Just wanted >> to let you know quickly. >> > > OK. Give it a try. I'll just retag 1.2.39 with all the "polishing" stuff > found. It's been a while since last release, so I was prepared for few > runs :) NP. A few polishing items and questions: You might want to add something about your IPV6 improvements to the change log. There's the prefer flag and also the possibility to use IPv6 addresses in the config, right? More? configure.in now checks for netdb.h and netinet/in.h but I couldn't find any use of those in the final code (except for old use in Netware case which doesn't rely on configure detection). Should we remove the new detection code for those two headers? native/nt_service/jk_nt_service.c still uses jk_resolve() with sockaddr_in instead of tne new jk struct. Should we remove native/nt_service or apply the probably simple fix to make it compatible with the new jk structs? I'd say we can drop it but should add it to changes and news. I don't remember anyone having askes about it for many years and I'm not even convinced it worked in 1.2.37. JK_INET / JK_INET6: it looks a bit confusing to me. - JK_INET is set to APR_INET in the APR case - JK_INET6 is always set to AF_INET6 in the IPv6 case, even when APR is used - jk_connect.c uses JK_INET / JK_INET6 in the non-APR case, but a mixture pf APR_INET / APR_INET6 and JK_INET / JK_INET6 in the APR case. I didn't find a functional problem due to the JK and APR stuff at the end being the same, but it looks confusing. Shouldn't we replace all APR_INET and APR_INET6 by JK_INET resp. JK_INET6 in teh code and set JK_INET6 similar to JK_INET depending on APR (=APR_INET6) or non-APR (=AF_INET6)? There are two places in common/jk_connect.c which use APR_HAVE_IPV6 and not JK_HAVE_IPV6. is this intentional? Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56190] New: Connection keep-alive not working with asynchronous servlet
https://issues.apache.org/bugzilla/show_bug.cgi?id=56190 Bug ID: 56190 Summary: Connection keep-alive not working with asynchronous servlet Product: Tomcat 8 Version: 8.0.3 Hardware: PC OS: Linux Status: NEW Severity: normal Priority: P2 Component: Specification APIs Assignee: dev@tomcat.apache.org Reporter: f...@apache.org Created attachment 31346 --> https://issues.apache.org/bugzilla/attachment.cgi?id=31346&action=edit AsyncHelloServlet.java I am trying to use asynchronous servlets. It looks like whenever you call request.startAsync() keep-alive is disabled and the response is sent in chunked transfer encoding. I attached the code of a simple servlet. I get these headers in the response: HTTP/1.1 200 OK Server: Apache-Coyote/1.1 Transfer-Encoding: chunked Date: Wed, 26 Feb 2014 13:25:29 GMT With a regular blocking servlet I get: HTTP/1.1 200 OK Server: Apache-Coyote/1.1 Content-Length: 11 Date: Wed, 26 Feb 2014 13:49:17 GMT -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56190] Connection keep-alive not working with asynchronous servlet
https://issues.apache.org/bugzilla/show_bug.cgi?id=56190 --- Comment #1 from Francois-Xavier Bonnet --- I have the same issue with Tomcat 7.0.52 -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1572069 - in /tomcat/trunk: build.properties.default webapps/docs/changelog.xml
Author: markt
Date: Wed Feb 26 14:52:35 2014
New Revision: 1572069
URL: http://svn.apache.org/r1572069
Log:
Keep pace with DBCP2 changes (just various bits of clean-up)
Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1572069&r1=1572068&r2=1572069&view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Wed Feb 26 14:52:35 2014
@@ -156,7 +156,7 @@ tomcat-native.win.2=${base-tomcat.loc.2}
#commons-dbcp.home=${base.path}/commons-dbcp-${commons-dbcp.version}-src
#commons-dbcp-src.loc.1=${base-commons.loc.1}/dbcp/source/commons-dbcp-${commons-dbcp.version}-src.tar.gz
#commons-dbcp-src.loc.2=${base-commons.loc.2}/dbcp/source/commons-dbcp-${commons-dbcp.version}-src.tar.gz
-commons-dbcp.version=2.0-20140225.124600-189
+commons-dbcp.version=2.0-20140226.144600-202
commons-dbcp.home=${base.path}/commons-dbcp2-2.0-SNAPSHOT-src
commons-dbcp-src.loc.1=https://repository.apache.org/content/repositories/snapshots/org/apache/commons/commons-dbcp2/2.0-SNAPSHOT/commons-dbcp2-${commons-dbcp.version}-src.tar.gz
commons-dbcp-src.loc.2=https://repository.apache.org/content/repositories/snapshots/org/apache/commons/commons-dbcp2/2.0-SNAPSHOT/commons-dbcp2-${commons-dbcp.version}-src.tar.gz
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1572069&r1=1572068&r2=1572069&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Feb 26 14:52:35 2014
@@ -168,7 +168,7 @@
Update Commons Pool 2 to 2.2. (markt)
-Update Commons DBCP 2 to snapshot 189 dated 25 Feb 2014. (markt)
+Update Commons DBCP 2 to snapshot 202 dated 26 Feb 2014. (markt)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1572120 - /tomcat/jk/trunk/native/common/jk_global.h
Author: mturk Date: Wed Feb 26 16:04:58 2014 New Revision: 1572120 URL: http://svn.apache.org/r1572120 Log: Ensure JK_INET6 is APR_INET6 Modified: tomcat/jk/trunk/native/common/jk_global.h Modified: tomcat/jk/trunk/native/common/jk_global.h URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_global.h?rev=1572120&r1=1572119&r2=1572120&view=diff == --- tomcat/jk/trunk/native/common/jk_global.h (original) +++ tomcat/jk/trunk/native/common/jk_global.h Wed Feb 26 16:04:58 2014 @@ -411,6 +411,7 @@ typedef int jk_sock_t; #if defined(HAVE_APR) #define JK_HAVE_IPV6APR_HAVE_IPV6 #define JK_INET APR_INET +#define JK_INET6APR_INET6 #define JK_UNSPEC APR_UNSPEC #else #if defined(WIN32) || defined(HAVE_AF_INET6) @@ -424,9 +425,11 @@ typedef int jk_sock_t; #else #define JK_UNSPEC 0 #endif -#endif #if JK_HAVE_IPV6 #define JK_INET6AF_INET6 +#else +#define JK_INET60 +#endif #endif typedef struct jk_sockaddr_t jk_sockaddr_t; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat Connectors 1.2.38
On 02/26/2014 02:30 PM, Rainer Jung wrote: On 26.02.2014 11:48, Mladen Turk wrote: native/nt_service/jk_nt_service.c still uses jk_resolve() with sockaddr_in instead of tne new jk struct. Should we remove native/nt_service or apply the probably simple fix to make it compatible with the new jk structs? I'd say we can drop it but should add it to changes and news. I don't remember anyone having askes about it for many years and I'm not even convinced it worked in 1.2.37. Yes. We should have drop this a long time ago. I'll axe the code and add the changelog entry. JK_INET / JK_INET6: it looks a bit confusing to me. - JK_INET is set to APR_INET in the APR case - JK_INET6 is always set to AF_INET6 in the IPv6 case, even when APR is used Fixed that. Although all the same since APR_INET6 is always AF_INET6 There are two places in common/jk_connect.c which use APR_HAVE_IPV6 and not JK_HAVE_IPV6. is this intentional? Yes, both APR_HAVE_IPV6 and APR_INET/APR_INET6 usage is intentional to have clarity inside strictly APR code. Those flags are the same anyhow. Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1572128 - in /tomcat/jk/trunk/tools: jkbindist.sh signfile.sh
Author: mturk
Date: Wed Feb 26 16:11:53 2014
New Revision: 1572128
URL: http://svn.apache.org/r1572128
Log:
Ensure we use the same shell for all the toools
Modified:
tomcat/jk/trunk/tools/jkbindist.sh
tomcat/jk/trunk/tools/signfile.sh
Modified: tomcat/jk/trunk/tools/jkbindist.sh
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/tools/jkbindist.sh?rev=1572128&r1=1572127&r2=1572128&view=diff
==
--- tomcat/jk/trunk/tools/jkbindist.sh (original)
+++ tomcat/jk/trunk/tools/jkbindist.sh Wed Feb 26 16:11:53 2014
@@ -1,5 +1,4 @@
-#!/bin/ksh
-
+#!/bin/bash
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
@@ -126,11 +125,10 @@ done
unix2dos README
chmod 755 $1
# Pack
-zip -9 -j ${dist}.zip $@ LICENSE README NOTICE ${copy}
-
-# Sign
archive=${dist}.zip
-. ${tools}/signfile.sh ${sign} $archive
+zip -9 -j ${archive} $@ README ${copy}
+# Sign
+. ${tools}/signfile.sh ${sign} ${archive}
# Cleanup
rm -f README ${copy} 2>/dev/null
Modified: tomcat/jk/trunk/tools/signfile.sh
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/tools/signfile.sh?rev=1572128&r1=1572127&r2=1572128&view=diff
==
--- tomcat/jk/trunk/tools/signfile.sh (original)
+++ tomcat/jk/trunk/tools/signfile.sh Wed Feb 26 16:11:53 2014
@@ -1,5 +1,4 @@
-#!/bin/sh
-
+#!/bin/bash
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1572132 - /tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
Author: mturk Date: Wed Feb 26 16:16:21 2014 New Revision: 1572132 URL: http://svn.apache.org/r1572132 Log: Add IPV6 to changelog Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1572132&r1=1572131&r2=1572132&view=diff == --- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original) +++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Wed Feb 26 16:16:21 2014 @@ -57,6 +57,11 @@ Patch contributed by areese yahoo-inc.com. (rjung) +Add IPV6 support for connection to webserver. +New directive prefer_ipv6 has been added to control the hostame resolution +and preserve backward compatibility. (mturk) + + Add --disable-sock-cloexec to configure to disable use of SOCK_CLOEXEC (using FD_CLOEXEC + fnctl instead) so built modules will work with Linux kernels prior to 2.6.27. (timw) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[CANCELED] Was: [VOTE] Release Apache Tomcat Connectors 1.2.38
Due to some issues found this vote is canceled Should I retag 1.2.38 or create 1.2.39? If later can we use the section name="Changes between 1.2.37 and 1.2.39" in the changelog since 1.2.38 was not released? On 02/26/2014 09:45 AM, Mladen Turk wrote: Hi, Apache Tomcat Connectors 1.2.38 release candidate is ready for vote at [1]. This version fixes few bugs found in released version 1.2.37 and adds some new features like IPV6 support. Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1572148 - /tomcat/jk/trunk/native/nt_service/
Author: mturk Date: Wed Feb 26 16:28:37 2014 New Revision: 1572148 URL: http://svn.apache.org/r1572148 Log: Deprecate nt_service Removed: tomcat/jk/trunk/native/nt_service/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1572154 - /tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
Author: mturk Date: Wed Feb 26 16:33:27 2014 New Revision: 1572154 URL: http://svn.apache.org/r1572154 Log: Add a note about deprecating nt_service Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1572154&r1=1572153&r2=1572154&view=diff == --- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original) +++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Wed Feb 26 16:33:27 2014 @@ -44,6 +44,9 @@ + +Deprecate nt_service from Tomcat Connectors. (mturk) + 56133: Fix possible crash when a request fails during request body transfer to the back end and reply_timeout was set. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [CANCELED] Was: [VOTE] Release Apache Tomcat Connectors 1.2.38
On 26.02.2014 17:19, Mladen Turk wrote: > Due to some issues found this vote is canceled > > Should I retag 1.2.38 or create 1.2.39? I'd slightly prefer we switch to 1.2.39 to ensure noone is using the obsolete 1.2.38 instead of the released code. > If later can we use the > section name="Changes between 1.2.37 and 1.2.39" > in the changelog since 1.2.38 was not released? OK for me. We should note the "missing" 1.2.38 in the release announcement though. Thanks! Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [CANCELED] Was: [VOTE] Release Apache Tomcat Connectors 1.2.38
On 02/26/2014 06:10 PM, Rainer Jung wrote: On 26.02.2014 17:19, Mladen Turk wrote: Due to some issues found this vote is canceled Should I retag 1.2.38 or create 1.2.39? I'd slightly prefer we switch to 1.2.39 to ensure noone is using the obsolete 1.2.38 instead of the released code. If later can we use the section name="Changes between 1.2.37 and 1.2.39" in the changelog since 1.2.38 was not released? OK for me. We should note the "missing" 1.2.38 in the release announcement though. ... and in the STATUS as 'not released' Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1572171 - in /tomcat/jk/trunk: native/STATUS.txt native/common/jk_version.h native/configure.ac native/iis/installer/isapi-redirector-win32-msi.ism xdocs/miscellaneous/changelog.xml
Author: mturk Date: Wed Feb 26 17:35:38 2014 New Revision: 1572171 URL: http://svn.apache.org/r1572171 Log: Update version numbers Modified: tomcat/jk/trunk/native/STATUS.txt tomcat/jk/trunk/native/common/jk_version.h tomcat/jk/trunk/native/configure.ac tomcat/jk/trunk/native/iis/installer/isapi-redirector-win32-msi.ism tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Modified: tomcat/jk/trunk/native/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/STATUS.txt?rev=1572171&r1=1572170&r2=1572171&view=diff == --- tomcat/jk/trunk/native/STATUS.txt (original) +++ tomcat/jk/trunk/native/STATUS.txt Wed Feb 26 17:35:38 2014 @@ -19,6 +19,7 @@ Last modified at [$Date$] Release: 1.2.38 : in development +1.2.38 : not released 1.2.37 : released May 31, 2012 1.2.36 : released May 14, 2012 1.2.35 : released March 24, 2012 Modified: tomcat/jk/trunk/native/common/jk_version.h URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_version.h?rev=1572171&r1=1572170&r2=1572171&view=diff == --- tomcat/jk/trunk/native/common/jk_version.h (original) +++ tomcat/jk/trunk/native/common/jk_version.h Wed Feb 26 17:35:38 2014 @@ -26,7 +26,7 @@ /** START OF AREA TO MODIFY BEFORE RELEASING */ #define JK_VERMAJOR 1 #define JK_VERMINOR 2 -#define JK_VERFIX 38 +#define JK_VERFIX 39 /* set JK_VERISRELEASE to 1 when release (do not forget to commit!) */ #define JK_VERISRELEASE 0 Modified: tomcat/jk/trunk/native/configure.ac URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/configure.ac?rev=1572171&r1=1572170&r2=1572171&view=diff == --- tomcat/jk/trunk/native/configure.ac (original) +++ tomcat/jk/trunk/native/configure.ac Wed Feb 26 17:35:38 2014 @@ -23,7 +23,7 @@ AC_PREREQ(2.59) dnl package and version. dnl synchronization with common/jk_version.h ? -AC_INIT([mod_jk], [1.2.38]) +AC_INIT([mod_jk], [1.2.39]) AC_CONFIG_SRCDIR([common/jk_worker.h]) AC_CONFIG_HEADER(common/config.h) Modified: tomcat/jk/trunk/native/iis/installer/isapi-redirector-win32-msi.ism URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/installer/isapi-redirector-win32-msi.ism?rev=1572171&r1=1572170&r2=1572171&view=diff == --- tomcat/jk/trunk/native/iis/installer/isapi-redirector-win32-msi.ism (original) +++ tomcat/jk/trunk/native/iis/installer/isapi-redirector-win32-msi.ism Wed Feb 26 17:35:38 2014 @@ -3425,7 +3425,7 @@ TQBzAGkAAQBSAGUAbABlAGEAcwBlAA== ProductIDnone ProductLanguage1033 ProductNameTomcat Isapi Redirector - ProductVersion1.2.38 + ProductVersion1.2.39 ProgressType0install ProgressType1Installing ProgressType2installed Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1572171&r1=1572170&r2=1572171&view=diff == --- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original) +++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Wed Feb 26 17:35:38 2014 @@ -40,7 +40,7 @@ new documentation project for JK was started. - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1572177 - /tomcat/jk/trunk/native/STATUS.txt
Author: mturk Date: Wed Feb 26 17:55:38 2014 New Revision: 1572177 URL: http://svn.apache.org/r1572177 Log: Fix copy/past typo Modified: tomcat/jk/trunk/native/STATUS.txt Modified: tomcat/jk/trunk/native/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/STATUS.txt?rev=1572177&r1=1572176&r2=1572177&view=diff == --- tomcat/jk/trunk/native/STATUS.txt (original) +++ tomcat/jk/trunk/native/STATUS.txt Wed Feb 26 17:55:38 2014 @@ -18,7 +18,7 @@ Last modified at [$Date$] Release: -1.2.38 : in development +1.2.39 : in development 1.2.38 : not released 1.2.37 : released May 31, 2012 1.2.36 : released May 14, 2012 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1572199 - /tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
Author: kkolinko Date: Wed Feb 26 19:05:19 2014 New Revision: 1572199 URL: http://svn.apache.org/r1572199 Log: Correct a typo Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1572199&r1=1572198&r2=1572199&view=diff == --- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original) +++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Wed Feb 26 19:05:19 2014 @@ -61,7 +61,7 @@ Add IPV6 support for connection to webserver. -New directive prefer_ipv6 has been added to control the hostame resolution +New directive prefer_ipv6 has been added to control the hostname resolution and preserve backward compatibility. (mturk) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Jasper Improvements
On 25 February 2014 17:04, Violeta Georgieva wrote: > We should be very careful when adding the OSGi meta data to the tomcat > artifacts. Something that is stopping me from adding it right now, is that > the different projects add different OSGi meta data specific to the > concrete project. For example I don't think that the way that is used in > Gemini Web/Virgo is sufficient for Jetty. > >From a Jetty point of view, if the apache project puts in OSGi meta data suitable for consumption by Gemini Web/Virgo, then we'd look at changing how we consume JSP in OSGi to use the same meta data.If it is not sufficient for us, then that's our problem and we'll deal with it externally. cheers -- Greg Wilkins http://eclipse.org/jetty HTTP, SPDY, Websocket server and client that scales http://www.webtide.com advice and support for jetty and cometd.
svn commit: r1572359 - /tomcat/jk/trunk/native/common/jk_global.h
Author: kkolinko Date: Thu Feb 27 00:01:03 2014 New Revision: 1572359 URL: http://svn.apache.org/r1572359 Log: Reviewing r1572120: Simplify, as JK_HAVE_IPV6 in this case is defined several lines earlier. Modified: tomcat/jk/trunk/native/common/jk_global.h Modified: tomcat/jk/trunk/native/common/jk_global.h URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_global.h?rev=1572359&r1=1572358&r2=1572359&view=diff == --- tomcat/jk/trunk/native/common/jk_global.h (original) +++ tomcat/jk/trunk/native/common/jk_global.h Thu Feb 27 00:01:03 2014 @@ -416,8 +416,10 @@ typedef int jk_sock_t; #else #if defined(WIN32) || defined(HAVE_AF_INET6) #define JK_HAVE_IPV61 +#define JK_INET6AF_INET6 #else #define JK_HAVE_IPV60 +#define JK_INET60 #endif #define JK_INET AF_INET #if defined(AF_UNSPEC) @@ -425,11 +427,6 @@ typedef int jk_sock_t; #else #define JK_UNSPEC 0 #endif -#if JK_HAVE_IPV6 -#define JK_INET6AF_INET6 -#else -#define JK_INET60 -#endif #endif typedef struct jk_sockaddr_t jk_sockaddr_t; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1572362 - /tomcat/jk/trunk/HOWTO-RELEASE.txt
Author: kkolinko Date: Thu Feb 27 00:14:39 2014 New Revision: 1572362 URL: http://svn.apache.org/r1572362 Log: Update instruction following the changes in r1572035 Modified: tomcat/jk/trunk/HOWTO-RELEASE.txt Modified: tomcat/jk/trunk/HOWTO-RELEASE.txt URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/HOWTO-RELEASE.txt?rev=1572362&r1=1572361&r2=1572362&view=diff == --- tomcat/jk/trunk/HOWTO-RELEASE.txt (original) +++ tomcat/jk/trunk/HOWTO-RELEASE.txt Thu Feb 27 00:14:39 2014 @@ -155,7 +155,7 @@ Update source for next version native/STATUS.txt: Add release date for released version and status "in development" for new version. -native/configure.ac: Update variable VERSION. +native/configure.ac: Update version in AC_INIT macro. native/common/jk_version.h: Update variables JK_VERMAJOR, JK_VERMINOR, JK_VERFIX, JK_VERSTRING, and JK_VERISRELEASE. native/iis/installer/isapi-redirector-win32-msi.ism: Update ProductVersion. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] tomcat pull request: Changes to make Jasper more separable from To...
GitHub user gregw opened a pull request: https://github.com/apache/tomcat/pull/4 Changes to make Jasper more separable from Tomcat These are the changes that the jetty project has made to make it easier to consume Jasper from apache. You can merge this pull request into a Git repository by running: $ git pull https://github.com/gregw/tomcat trunk Alternatively you can review and apply these changes as the patch at: https://github.com/apache/tomcat/pull/4.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #4 commit 191a3cf665719097fb6241b1a81af4d9339fae78 Author: Greg Wilkins Date: 2014-02-26T22:28:43Z Create README.md commit 0a9046f64bad32ddfc1784886bf044f6292015fa Author: Greg Wilkins Date: 2014-02-27T00:41:38Z Changes to make jasper more separable from tomcat --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Jasper Improvements
Just in case it was missed, here is the pull request I generated: https://github.com/apache/tomcat/pull/4 Happy to talk about individual changes either in the comments there or here. cheers On 27 February 2014 09:24, Greg Wilkins wrote: > > On 25 February 2014 17:04, Violeta Georgieva wrote: > >> We should be very careful when adding the OSGi meta data to the tomcat >> artifacts. Something that is stopping me from adding it right now, is that >> the different projects add different OSGi meta data specific to the >> concrete project. For example I don't think that the way that is used in >> Gemini Web/Virgo is sufficient for Jetty. >> > > From a Jetty point of view, if the apache project puts in OSGi meta data > suitable for consumption by Gemini Web/Virgo, then we'd look at changing > how we consume JSP in OSGi to use the same meta data.If it is not > sufficient for us, then that's our problem and we'll deal with it > externally. > > cheers > > > -- > Greg Wilkins > http://eclipse.org/jetty HTTP, SPDY, Websocket server and client that > scales > http://www.webtide.com advice and support for jetty and cometd. > -- Greg Wilkins http://eclipse.org/jetty HTTP, SPDY, Websocket server and client that scales http://www.webtide.com advice and support for jetty and cometd.
TldScanner + Config, was: Jasper Improvements
On Feb 26, 2014, at 4:55 PM, Greg Wilkins wrote: > Just in case it was missed, here is the pull request I generated: > > https://github.com/apache/tomcat/pull/4 > > Happy to talk about individual changes either in the comments there or here. Related to the TldScanner changes, I’m assuming you have some integration code in Jetty that is sub-classing the initializer and overriding newTldScanner? I was thinking of supporting compile-on-start as a option where the initializer would scan the war for JSP(x) files and initiate the compilation during startup. This was intended for production use where use of JspC was not practical (e.g. because the actual version of runtime is not known at pre-compilation time) but where taking a hit on access would be undesirable. I was thinking there to combine the TLD and JSP scans into one. There may be other reasons to scan e.g. looking for tag-plugins packaged in jars (no XML config needed a bit like a Tld). We also have an issue where Jasper is very reliant on system properties and the Options built from the init-params of JspServlet. In short, I’m wondering if instead of the subclassing we define a JasperConfiguration interface and have the initializer look for an instance of it in a context attribute. The configuration there would allow the container to replace parts of Jasper’s initialization (e.g. by supplying a Collection of pre-scanned TLDs, by identifying TLDs "provided by the container” etc.) and other configuration on a per-context basis. Would something like that work for you? Cheers Jeremy signature.asc Description: Message signed with OpenPGP using GPGMail
