Re: About the websocket chat, how can I send the message to specified persons or group?
This is a question for the users list not the dev list. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Time for 6.0.37?
On 04/25/2013 02:49 PM, Mark Thomas wrote: On 25/04/2013 10:33, jean-frederic clere wrote: Hi, I think it is time for a 6.0.37, comments? Sure. Haven't looked at the status file for a while so I probably have some voting to do. I have done the same. I now commit the accepted patches, OK? Cheers Jean-Frederic - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1476538 [3/3] - in /tomcat/tc6.0.x/trunk: STATUS.txt conf/web.xml webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1476538r1=1476537r2=1476538view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sat Apr 27 08:54:15 2013 @@ -103,6 +103,9 @@ subsection name=Web applications changelog update +bug54527/bug: Synchronize conf/web.xml mime mapping with Tomcat 7. (markt) + /update + update bug22278/bug: Add a commented out sample configuration of codeRemoteAddrValve/code to codeMETA-INF/context.xml/code files of the Manager and Host Manager applications. (kkolinko) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1476538 [1/3] - in /tomcat/tc6.0.x/trunk: STATUS.txt conf/web.xml webapps/docs/changelog.xml
Author: jfclere Date: Sat Apr 27 08:54:15 2013 New Revision: 1476538 URL: http://svn.apache.org/r1476538 Log: commit accepted patch for BZ 54527. Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/conf/web.xml tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1476538r1=1476537r2=1476538view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Apr 27 08:54:15 2013 @@ -88,13 +88,6 @@ PATCHES PROPOSED TO BACKPORT: +1: kkolinko, markt, rjung -1: -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54527 - Update file extension to MIME type mapping in web.xml. Aligh with current - trunk. - https://issues.apache.org/bugzilla/attachment.cgi?id=29962 - +1: markt, kkolinko, jfclere - -1: - * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54601 Change catalina.sh to consistently use LOGGING_MANAGER variable to configure logging, instead of modifying JAVA_OPTS one. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1476541 - in /tomcat/tc6.0.x/trunk: java/org/apache/catalina/ssi/SSIProcessor.java webapps/docs/changelog.xml
Author: jfclere
Date: Sat Apr 27 09:39:02 2013
New Revision: 1476541
URL: http://svn.apache.org/r1476541
Log:
commit accepted patch for BZ 54382.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ssi/SSIProcessor.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ssi/SSIProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ssi/SSIProcessor.java?rev=1476541r1=1476540r2=1476541view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ssi/SSIProcessor.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ssi/SSIProcessor.java Sat Apr
27 09:39:02 2013
@@ -306,11 +306,11 @@ public class SSIProcessor {
break;
}
}
-String command = null;
-if (firstLetter != -1) {
-command = cmd.substring(firstLetter, lastLetter + 1);
+if (firstLetter == -1) {
+return ;
+} else {
+return cmd.substring(firstLetter, lastLetter + 1);
}
-return command;
}
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1476541r1=1476540r2=1476541view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sat Apr 27 09:39:02 2013
@@ -46,7 +46,11 @@
section name=Tomcat 6.0.37 (jfclere)
subsection name=Catalina
changelog
- fix
+ fix
+ bug54382/bug: Fix NPE when SSI processing is enabled and an empty
+ SSI directive is present. (markt)
+ /fix
+ fix
bug53481/bug: Added support for SSLHonorCipherOrder to allow
the server to impose its cipher order on the client. Based on a patch
provided by Marcel Å ebek. (schultz)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1476542 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: jfclere Date: Sat Apr 27 09:41:54 2013 New Revision: 1476542 URL: http://svn.apache.org/r1476542 Log: Add missing part of the previous commit r1476541 commit accepted patch for BZ 54382. Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1476542r1=1476541r2=1476542view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Apr 27 09:41:54 2013 @@ -73,13 +73,6 @@ PATCHES PROPOSED TO BACKPORT: +1: kkolinko, schultz -1: -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54382 - Avoid NPE with an empty SSI directive - http://svn.apache.org/viewvc?view=revisionrevision=1430553 - (r1430550 in trunk) - +1: kkolinko, markt, rjung - -1: - * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54456 If the client aborts the request, make sure this is communicated to the application reading the request body. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1476543 - in /tomcat/tc6.0.x/trunk: STATUS.txt bin/daemon.sh webapps/docs/changelog.xml webapps/docs/setup.xml
Author: jfclere Date: Sat Apr 27 09:49:25 2013 New Revision: 1476543 URL: http://svn.apache.org/r1476543 Log: Add (back) bin/daemon.sh Added: tomcat/tc6.0.x/trunk/bin/daemon.sh Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml tomcat/tc6.0.x/trunk/webapps/docs/setup.xml Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1476543r1=1476542r2=1476543view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Apr 27 09:49:25 2013 @@ -89,16 +89,6 @@ PATCHES PROPOSED TO BACKPORT: +1: kkolinko, rjung -1: -* Add sample Apache Commons Daemon JSVC wrapper script bin/daemon.sh that - can be used with /etc/init.d. - This file is needed, as it has been removed from Commons Daemon and thus - a reference to it in docs/setup.html became incorrect. - This copy of daemon.sh differs from Tomcat trunk one in initialization of - CLASSPATH setting, because tomcat-juli.jar has to be handled differently. - http://people.apache.org/~kkolinko/patches/2013-03-26_tc6_daemonsh.patch - +1: kkolinko, jfclere, rjung - -1: - * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54615 Update to Eclipse JDT Compiler 4.2.2 http://people.apache.org/~kkolinko/patches/2013-03-26_tc6_eclipse422.patch Added: tomcat/tc6.0.x/trunk/bin/daemon.sh URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/daemon.sh?rev=1476543view=auto == --- tomcat/tc6.0.x/trunk/bin/daemon.sh (added) +++ tomcat/tc6.0.x/trunk/bin/daemon.sh Sat Apr 27 09:49:25 2013 @@ -0,0 +1,239 @@ +#!/bin/sh + +# 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. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the License); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an AS IS BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# - +# Commons Daemon wrapper script. +# +# $Id: daemon.sh 1202058 2011-11-15 06:37:12Z mturk $ +# - +# +# resolve links - $0 may be a softlink +ARG0=$0 +while [ -h $ARG0 ]; do + ls=`ls -ld $ARG0` + link=`expr $ls : '.*- \(.*\)$'` + if expr $link : '/.*' /dev/null; then +ARG0=$link + else +ARG0=`dirname $ARG0`/$link + fi +done +DIRNAME=`dirname $ARG0` +PROGRAM=`basename $ARG0` +while [ .$1 != . ] +do + case $1 in +--java-home ) +JAVA_HOME=$2 +shift; shift; +continue +;; +--catalina-home ) +CATALINA_HOME=$2 +shift; shift; +continue +;; +--catalina-base ) +CATALINA_BASE=$2 +shift; shift; +continue +;; +--catalina-pid ) +CATALINA_PID=$2 +shift; shift; +continue +;; +--tomcat-user ) +TOMCAT_USER=$2 +shift; shift; +continue +;; +* ) +break +;; + esac +done +# OS specific support (must be 'true' or 'false'). +cygwin=false; +darwin=false; +case `uname` in +CYGWIN*) +cygwin=true +;; +Darwin*) +darwin=true +;; +esac + +# Use the maximum available, or set MAX_FD != -1 to use that +test .$MAX_FD = . MAX_FD=maximum +# Setup parameters for running the jsvc +# +test .$TOMCAT_USER = . TOMCAT_USER=tomcat +# Set JAVA_HOME to working JDK or JRE +# JAVA_HOME=/opt/jdk-1.6.0.22 +# If not set we'll try to guess the JAVA_HOME +# from java binary if on the PATH +# +if [ -z $JAVA_HOME ]; then +JAVA_BIN=`which java 2/dev/null || type java 21` +test -x $JAVA_BIN JAVA_HOME=`dirname $JAVA_BIN` +test .$JAVA_HOME != . JAVA_HOME=`cd $JAVA_HOME/.. /dev/null; pwd` +else +JAVA_BIN=$JAVA_HOME/bin/java +fi + +# Only set CATALINA_HOME if not already set +test .$CATALINA_HOME = . CATALINA_HOME=`cd $DIRNAME/.. /dev/null; pwd` +test .$CATALINA_BASE = . CATALINA_BASE=$CATALINA_HOME +test .$CATALINA_MAIN = . CATALINA_MAIN=org.apache.catalina.startup.Bootstrap +test .$JSVC = . JSVC=$CATALINA_BASE/bin/jsvc + +# Ensure that any user defined CLASSPATH variables are not used on startup, +# but allow them to be specified in setenv.sh, in rare case when it is needed. +CLASSPATH= +JAVA_OPTS= +if [ -r
svn commit: r1476544 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/coyote/http11/filters/ChunkedInputFilter.java webapps/docs/changelog.xml
Author: jfclere
Date: Sat Apr 27 09:57:34 2013
New Revision: 1476544
URL: http://svn.apache.org/r1476544
Log:
commit accepted patch for BZ 54456
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1476544r1=1476543r2=1476544view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Apr 27 09:57:34 2013
@@ -73,14 +73,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: kkolinko, schultz
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54456
- If the client aborts the request, make sure this is communicated to the
- application reading the request body.
- http://svn.apache.org/viewvc?rev=1443430view=rev
- (r1443427 in trunk)
- +1: kkolinko, markt, rjung
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54601
Change catalina.sh to consistently use LOGGING_MANAGER variable to
configure logging, instead of modifying JAVA_OPTS one.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java?rev=1476544r1=1476543r2=1476544view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
Sat Apr 27 09:57:34 2013
@@ -164,7 +164,10 @@ public class ChunkedInputFilter implemen
int result = 0;
if (pos = lastValid) {
-readBytes();
+if (readBytes() 0) {
+throw new IOException(
+Unexpected end of stream whilst reading request
body);
+}
}
if (remaining (lastValid - pos)) {
@@ -378,7 +381,7 @@ public class ChunkedInputFilter implemen
*/
protected boolean parseEndChunk() throws IOException {
-// Handle option trailer headers
+// Handle optional trailer headers
while (parseHeader()) {
// Loop until we run out of headers
}
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1476544r1=1476543r2=1476544view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sat Apr 27 09:57:34 2013
@@ -86,6 +86,11 @@
subsection name=Coyote
changelog
fix
+bug54456/bug: Ensure that if a client aborts a request when sending
+a chunked request body that this is communicated correctly to the
client
+reading the request body. (markt)
+ /fix
+ fix
bug54248/bug: Ensure that byte order marks are swallowed when using
a Reader to read a request body with a BOM for those encodings that
require byte order marks. (markt)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1476547 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/juli/DateFormatCache.java webapps/docs/changelog.xml
Author: jfclere
Date: Sat Apr 27 10:05:58 2013
New Revision: 1476547
URL: http://svn.apache.org/r1476547
Log:
commit accepted patch for BZ 54044
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/juli/DateFormatCache.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1476547r1=1476546r2=1476547view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Apr 27 10:05:58 2013
@@ -58,14 +58,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: markt, kkolinko, jfclere
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54044
- Correct bug in timestamp cache used by org.apache.juli.OneLineFormatter
- that meant entries could be made with an earlier timestamp than the true
timestamp.
- (The test was added to tomcat6-testing branch in r1408453)
- http://svn.apache.org/viewvc?view=revisionrevision=1408459
- +1: kkolinko, markt, rjung
- -1:
-
* Improve method cache handling in SecurityUtil class.
Add caching for Comet methods and simplify cache lookup code.
It is backport of r728776 (BZ 46304) and r1429360
Modified: tomcat/tc6.0.x/trunk/java/org/apache/juli/DateFormatCache.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/juli/DateFormatCache.java?rev=1476547r1=1476546r2=1476547view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/juli/DateFormatCache.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/juli/DateFormatCache.java Sat Apr 27
10:05:58 2013
@@ -101,14 +101,14 @@ public class DateFormatCache {
private class Cache {
/* Second formatted in most recent invocation */
-private long previousSeconds = 0L;
+private long previousSeconds = Long.MIN_VALUE;
/* Formatted timestamp generated in most recent invocation */
private String previousFormat = ;
/* First second contained in cache */
-private long first = 0L;
+private long first = Long.MIN_VALUE;
/* Last second contained in cache */
-private long last = 0L;
+private long last = Long.MIN_VALUE;
/* Index of first in the cyclic cache */
private int offset = 0;
/* Helper object to be able to call SimpleDateFormat.format(). */
@@ -165,14 +165,16 @@ public class DateFormatCache {
for (int i = 1; i seconds - last; i++) {
cache[(index + cacheSize - i) % cacheSize] = null;
}
-first = seconds - cacheSize;
+first = seconds - (cacheSize - 1);
last = seconds;
+offset = (index + 1) % cacheSize;
} else if (seconds first) {
for (int i = 1; i first - seconds; i++) {
cache[(index + i) % cacheSize] = null;
}
first = seconds;
-last = seconds + cacheSize;
+last = seconds + (cacheSize - 1);
+offset = index;
}
/* Last step: format new timestamp either using
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1476547r1=1476546r2=1476547view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sat Apr 27 10:05:58 2013
@@ -47,6 +47,11 @@
subsection name=Catalina
changelog
fix
+bug54044/bug: Correct bug in timestamp cache used by logging
+(including the access log valve) that meant entries could be made with
+an earlier timestamp than the true timestamp. (markt)
+ /fix
+ fix
bug54382/bug: Fix NPE when SSI processing is enabled and an empty
SSI directive is present. (markt)
/fix
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1476559 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Sat Apr 27 12:12:34 2013 New Revision: 1476559 URL: http://svn.apache.org/r1476559 Log: Respond Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1476559r1=1476558r2=1476559view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Apr 27 12:12:34 2013 @@ -87,6 +87,20 @@ PATCHES PROPOSED TO BACKPORT: rjung: The svn merge doesn't apply cleanly. You don't want to change TCN_REQUIRED_PATCH or add TCN_RECOMMENDED_MINOR, correct? Only increment TCN_RECOMMENDED_PV to 27? + kkolinko: + 1. Yes, I mean only TCN_RECOMMENDED_PV: s/22/27/ + + 2. TCN_RECOMMENDED_MINOR is the same as TCN_REQUIRED_MINOR. + It was added to allow running with native 1.2.x along with + some change in version check logic. (r782010) + The difference between the two is currently irrelevant, as the + version check logic has been backported from Tomcat 7. + + 3. TCN_REQUIRED_PATCH was incremented to 24 in Tomcat 7 as it + required support for per-socket timeouts inside poller added in + native 1.1.24. + I am OK with it staying as 17 in Tomcat 6. + PATCHES/ISSUES THAT ARE STALLED - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1476560 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Author: kkolinko Date: Sat Apr 27 12:18:42 2013 New Revision: 1476560 URL: http://svn.apache.org/r1476560 Log: Changelog for r1475733 Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1476560r1=1476559r2=1476560view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sat Apr 27 12:18:42 2013 @@ -152,6 +152,9 @@ Update to Eclipse JDT Compiler 4.2.2. (kkolinko) /update update +bug54890/bug: Update to Apache Commons Daemon 1.0.15. (mturk) + /update + update Convert remaining unit tests to JUnit 4 and enable Checkstyle rule that forbids use of methods from JUnit 3. (markt/kkolinko) /update - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1476561 - /tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Author: kkolinko Date: Sat Apr 27 12:21:48 2013 New Revision: 1476561 URL: http://svn.apache.org/r1476561 Log: Changelog for Mladen's r1475731 Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1476561r1=1476560r2=1476561view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sat Apr 27 12:21:48 2013 @@ -156,6 +156,9 @@ bug54390/bug: Use 'java_home' on Mac OS X to auto-detect JAVA_HOME. (schultz) /fix + update +bug54890/bug: Update to Apache Commons Daemon 1.0.15. (mturk) + /update /changelog /subsection /section - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Time for 6.0.37?
Jean-Frederic, did there is a list of changes in 6.0.37 ? 2013/4/27 jean-frederic clere jfcl...@gmail.com On 04/25/2013 02:49 PM, Mark Thomas wrote: On 25/04/2013 10:33, jean-frederic clere wrote: Hi, I think it is time for a 6.0.37, comments? Sure. Haven't looked at the status file for a while so I probably have some voting to do. I have done the same. I now commit the accepted patches, OK? Cheers Jean-Frederic --**--**- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.**orgdev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54527] Synchronize conf/web.xml mime mapping with Tomcat 7
https://issues.apache.org/bugzilla/show_bug.cgi?id=54527 Konstantin Kolinko knst.koli...@gmail.com changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #7 from Konstantin Kolinko knst.koli...@gmail.com --- Fixed in 6.0 by r1476538 , will be in 6.0.37. -- 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
Re: Time for 6.0.37?
On 04/27/2013 03:09 PM, Henri Gomez wrote: Jean-Frederic, did there is a list of changes in 6.0.37 ? What do you mean? - The STATUS.txt still contains a bunch of patches that needs review. - webapps/docs/changelog.xml should contain the list of changes. Cheers Jean-Frederic - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1476568 - /tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Author: kkolinko Date: Sat Apr 27 13:21:30 2013 New Revision: 1476568 URL: http://svn.apache.org/r1476568 Log: Correct ordering of changelog items Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1476568r1=1476567r2=1476568view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sat Apr 27 13:21:30 2013 @@ -47,20 +47,16 @@ subsection name=Catalina changelog fix +bug53481/bug: Added support for SSLHonorCipherOrder to allow +the server to impose its cipher order on the client. Based on a patch +provided by Marcel #x160;ebek. (schultz) + /fix + fix bug54044/bug: Correct bug in timestamp cache used by logging (including the access log valve) that meant entries could be made with an earlier timestamp than the true timestamp. (markt) /fix fix - bug54382/bug: Fix NPE when SSI processing is enabled and an empty - SSI directive is present. (markt) - /fix - fix - bug53481/bug: Added support for SSLHonorCipherOrder to allow - the server to impose its cipher order on the client. Based on a patch - provided by Marcel Å ebek. (schultz) - /fix - fix In FormAuthenticator: If it is configured to change Session IDs, do the change before displaying the login form. (kkolinko) /fix @@ -83,19 +79,22 @@ if their destroy() method fails with an Error. (kkolinko) /fix fix +bug54382/bug: Fix NPE when SSI processing is enabled and an empty +SSI directive is present. (markt) + /fix + fix bug54483/bug: Correct one of the Spanish translations. Based on a suggestion from adinamita. (kkolinko) /fix + update +bug54527/bug: Synchronize conf/web.xml mime mapping with Tomcat 7. +(markt) + /update /changelog /subsection subsection name=Coyote changelog fix -bug54456/bug: Ensure that if a client aborts a request when sending -a chunked request body that this is communicated correctly to the client -reading the request body. (markt) - /fix - fix bug54248/bug: Ensure that byte order marks are swallowed when using a Reader to read a request body with a BOM for those encodings that require byte order marks. (markt) @@ -104,6 +103,11 @@ bug54324/bug: Allow APR connector to disable TLS compression if OpenSSL supports it. (schultz) /fix + fix +bug54456/bug: Ensure that if a client aborts a request when sending +a chunked request body that this is communicated correctly to the client +reading the request body. (markt) + /fix /changelog /subsection subsection name=Cluster @@ -117,9 +121,6 @@ subsection name=Web applications changelog update -bug54527/bug: Synchronize conf/web.xml mime mapping with Tomcat 7. (markt) - /update - update bug22278/bug: Add a commented out sample configuration of codeRemoteAddrValve/code to codeMETA-INF/context.xml/code files of the Manager and Host Manager applications. (kkolinko) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54382] Nullpointer Exception after activating SSI and loading of any html-file with a specific comment
https://issues.apache.org/bugzilla/show_bug.cgi?id=54382 --- Comment #3 from Konstantin Kolinko knst.koli...@gmail.com --- Fixed in Tomcat 6 by r1476541 , will be in 6.0.37 -- 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 54044] AccessLogValve using stale date/time with SimpleDateFormat
https://issues.apache.org/bugzilla/show_bug.cgi?id=54044 --- Comment #9 from Konstantin Kolinko knst.koli...@gmail.com --- Fixed in Tomcat 6 by r1476547 , will be in 6.0.37. -- 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: r1476574 - /tomcat/tc6.0.x/trunk/bin/daemon.sh
Author: kkolinko Date: Sat Apr 27 13:36:46 2013 New Revision: 1476574 URL: http://svn.apache.org/r1476574 Log: SVN properties for file added in r1476543 Modified: tomcat/tc6.0.x/trunk/bin/daemon.sh (props changed) Propchange: tomcat/tc6.0.x/trunk/bin/daemon.sh -- svn:eol-style = native Propchange: tomcat/tc6.0.x/trunk/bin/daemon.sh -- svn:executable = * - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54456] ChunkedInputFilter returning EOF when client closes connection without sending end chunk
https://issues.apache.org/bugzilla/show_bug.cgi?id=54456 --- Comment #13 from Konstantin Kolinko knst.koli...@gmail.com --- Fixed in Tomcat 6 by r1476544 , will be in 6.0.37. -- 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: r1476575 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Sat Apr 27 13:48:15 2013 New Revision: 1476575 URL: http://svn.apache.org/r1476575 Log: Propose a patch file, to be more specific. Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1476575r1=1476574r2=1476575view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Apr 27 13:48:15 2013 @@ -81,25 +81,10 @@ PATCHES PROPOSED TO BACKPORT: * Update the native component of the APR/native connector to 1.1.27 and make that version the recommended minimum version. - http://svn.apache.org/r1445210 + http://people.apache.org/~kkolinko/patches/2013-04-27_tc6_native1127.patch + ( r1445210 in Tomcat 7) +1: kkolinko, rjung -1: - rjung: The svn merge doesn't apply cleanly. You don't want to - change TCN_REQUIRED_PATCH or add TCN_RECOMMENDED_MINOR, correct? - Only increment TCN_RECOMMENDED_PV to 27? - kkolinko: - 1. Yes, I mean only TCN_RECOMMENDED_PV: s/22/27/ - - 2. TCN_RECOMMENDED_MINOR is the same as TCN_REQUIRED_MINOR. - It was added to allow running with native 1.2.x along with - some change in version check logic. (r782010) - The difference between the two is currently irrelevant, as the - version check logic has been backported from Tomcat 7. - - 3. TCN_REQUIRED_PATCH was incremented to 24 in Tomcat 7 as it - required support for per-socket timeouts inside poller added in - native 1.1.24. - I am OK with it staying as 17 in Tomcat 6. PATCHES/ISSUES THAT ARE STALLED - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1476577 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: jfclere Date: Sat Apr 27 14:02:23 2013 New Revision: 1476577 URL: http://svn.apache.org/r1476577 Log: my vote. Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1476577r1=1476576r2=1476577view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Apr 27 14:02:23 2013 @@ -83,7 +83,7 @@ PATCHES PROPOSED TO BACKPORT: make that version the recommended minimum version. http://people.apache.org/~kkolinko/patches/2013-04-27_tc6_native1127.patch ( r1445210 in Tomcat 7) - +1: kkolinko, rjung + +1: kkolinko, rjung, jfclere -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1476590 - in /tomcat/tc6.0.x/trunk: STATUS.txt build.properties.default java/org/apache/catalina/core/AprLifecycleListener.java webapps/docs/changelog.xml
Author: kkolinko
Date: Sat Apr 27 14:36:32 2013
New Revision: 1476590
URL: http://svn.apache.org/r1476590
Log:
Update the native component of the APR/native connector to 1.1.27
and make that version the recommended minimum version.
Backport of r1445210 from Tomcat 7.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/build.properties.default
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1476590r1=1476589r2=1476590view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Apr 27 14:36:32 2013
@@ -79,14 +79,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: kkolinko, rjung
-1:
-* Update the native component of the APR/native connector to 1.1.27 and
- make that version the recommended minimum version.
- http://people.apache.org/~kkolinko/patches/2013-04-27_tc6_native1127.patch
- ( r1445210 in Tomcat 7)
- +1: kkolinko, rjung, jfclere
- -1:
-
-
PATCHES/ISSUES THAT ARE STALLED
* Backport JSP unloading patch (BZ48358).
Modified: tomcat/tc6.0.x/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.properties.default?rev=1476590r1=1476589r2=1476590view=diff
==
--- tomcat/tc6.0.x/trunk/build.properties.default (original)
+++ tomcat/tc6.0.x/trunk/build.properties.default Sat Apr 27 14:36:32 2013
@@ -117,7 +117,7 @@ jdt.loc.1=http://archive.eclipse.org/ecl
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops/${jdt.release}/ecj-${jdt.version}.jar
# - Tomcat native library -
-tomcat-native.version=1.1.23
+tomcat-native.version=1.1.27
tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java?rev=1476590r1=1476589r2=1476590view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
Sat Apr 27 14:36:32 2013
@@ -62,7 +62,7 @@ public class AprLifecycleListener
protected static final int TCN_REQUIRED_MAJOR = 1;
protected static final int TCN_REQUIRED_MINOR = 1;
protected static final int TCN_REQUIRED_PATCH = 17;
-protected static final int TCN_RECOMMENDED_PV = 22;
+protected static final int TCN_RECOMMENDED_PV = 27;
// -- Properties
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1476590r1=1476589r2=1476590view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sat Apr 27 14:36:32 2013
@@ -108,6 +108,10 @@
a chunked request body that this is communicated correctly to the
client
reading the request body. (markt)
/fix
+ update
+Update the native component of the APR/native connector to 1.1.27 and
+make that version the recommended minimum version. (kkolinko)
+ /update
/changelog
/subsection
subsection name=Cluster
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1476592 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
Author: jfclere
Date: Sat Apr 27 14:42:09 2013
New Revision: 1476592
URL: http://svn.apache.org/r1476592
Log:
commit accepted patch for Chunked encoding improvements.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1476592r1=1476591r2=1476592view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Apr 27 14:42:09 2013
@@ -53,11 +53,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: kkolinko, schultz
-1:
-* Chunked encoding improvements
- http://people.apache.org/~markt/patches/2012-10-19-chunked-encoding-tc6.patch
- +1: markt, kkolinko, jfclere
- -1:
-
* Improve method cache handling in SecurityUtil class.
Add caching for Comet methods and simplify cache lookup code.
It is backport of r728776 (BZ 46304) and r1429360
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java?rev=1476592r1=1476591r2=1476592view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
Sat Apr 27 14:42:09 2013
@@ -148,7 +148,7 @@ public class ChunkedInputFilter implemen
if(needCRLFParse) {
needCRLFParse = false;
-parseCRLF();
+parseCRLF(false);
}
if (remaining = 0) {
@@ -186,7 +186,7 @@ public class ChunkedInputFilter implemen
//so we defer it to the next call BZ 7
needCRLFParse = true;
} else {
-parseCRLF(); //parse the CRLF immediately
+parseCRLF(false); //parse the CRLF immediately
}
}
@@ -303,8 +303,8 @@ public class ChunkedInputFilter implemen
return false;
}
-if (buf[pos] == Constants.CR) {
-} else if (buf[pos] == Constants.LF) {
+if (buf[pos] == Constants.CR || buf[pos] == Constants.LF) {
+parseCRLF(false);
eol = true;
} else if (buf[pos] == Constants.SEMI_COLON) {
trailer = true;
@@ -322,7 +322,10 @@ public class ChunkedInputFilter implemen
}
}
-pos++;
+// Parsing the CRLF increments pos
+if (!eol) {
+pos++;
+}
}
@@ -343,9 +346,22 @@ public class ChunkedInputFilter implemen
/**
* Parse CRLF at end of chunk.
+ * @deprecated Use {@link #parseCRLF(boolean)}
*/
-protected boolean parseCRLF()
-throws IOException {
+@Deprecated
+protected boolean parseCRLF() throws IOException {
+parseCRLF(false);
+return true;
+}
+
+/**
+ * Parse CRLF at end of chunk.
+ *
+ * @param tolerantShould tolerant parsing (LF and CRLF) be used? This
+ * is recommended (RFC2616, section 19.3) for message
+ * headers.
+ */
+protected void parseCRLF(boolean tolerant) throws IOException {
boolean eol = false;
boolean crfound = false;
@@ -361,7 +377,9 @@ public class ChunkedInputFilter implemen
if (crfound) throw new IOException(Invalid CRLF, two CR
characters encountered.);
crfound = true;
} else if (buf[pos] == Constants.LF) {
-if (!crfound) throw new IOException(Invalid CRLF, no CR
character encountered.);
+if (!tolerant !crfound) {
+throw new IOException(Invalid CRLF, no CR character
encountered.);
+}
eol = true;
} else {
throw new IOException(Invalid CRLF);
@@ -370,9 +388,6 @@ public class ChunkedInputFilter implemen
pos++;
}
-
-return true;
-
}
@@ -394,26 +409,19 @@ public class ChunkedInputFilter implemen
MimeHeaders headers = request.getMimeHeaders();
byte chr = 0;
-while (true) {
-// Read new bytes if needed
-if (pos = lastValid) {
-if (readBytes() 0)
-throw new EOFException(Unexpected end of stream whilst
reading trailer headers for chunked request);
-}
-chr = buf[pos];
-
-if ((chr == Constants.CR) || (chr == Constants.LF)) {
-if (chr == Constants.LF) {
-pos++;
-return false;
-}
-
svn commit: r1476598 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: jfclere Date: Sat Apr 27 15:01:03 2013 New Revision: 1476598 URL: http://svn.apache.org/r1476598 Log: more votes. Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1476598r1=1476597r2=1476598view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Apr 27 15:01:03 2013 @@ -40,7 +40,7 @@ PATCHES PROPOSED TO BACKPORT: debug level. http://people.apache.org/~kkolinko/patches/2013-03-24_tc6_52184_UserDataHelper.patch - +1: kkolinko, rjung + +1: kkolinko, rjung, jfclere -1: * For https://issues.apache.org/bugzilla/show_bug.cgi?id=52055 @@ -50,7 +50,7 @@ PATCHES PROPOSED TO BACKPORT: The nextRequest() method already recycles the filters. If it has been called, then lastActiveFilter is -1 and the new code will be NOOP. http://people.apache.org/~kkolinko/patches/2012-06-02_tc6_recycle.patch - +1: kkolinko, schultz + +1: kkolinko, schultz, jfclere -1: * Improve method cache handling in SecurityUtil class. @@ -65,14 +65,15 @@ PATCHES PROPOSED TO BACKPORT: configure logging, instead of modifying JAVA_OPTS one. https://issues.apache.org/bugzilla/attachment.cgi?id=29985 (backport of r1449406; r1449412 in tc7) - +1: kkolinko, rjung + +1: kkolinko, rjung, jfclere -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54615 Update to Eclipse JDT Compiler 4.2.2 http://people.apache.org/~kkolinko/patches/2013-03-26_tc6_eclipse422.patch +1: kkolinko, rjung - -1: + -1: jfclere: I am ~OK to add the method to allow to compile but not to + change the major version of ecj PATCHES/ISSUES THAT ARE STALLED - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
ECJ update in Tomcat 6 (was Re: svn commit: r1476598)
2013/4/27 jfcl...@apache.org: Author: jfclere Date: Sat Apr 27 15:01:03 2013 New Revision: 1476598 URL: http://svn.apache.org/r1476598 Log: more votes. Modified: tomcat/tc6.0.x/trunk/STATUS.txt * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54615 Update to Eclipse JDT Compiler 4.2.2 http://people.apache.org/~kkolinko/patches/2013-03-26_tc6_eclipse422.patch +1: kkolinko, rjung - -1: + -1: jfclere: I am ~OK to add the method to allow to compile but not to + change the major version of ecj What are your technical reasons? I am in favor of this update, because 1) ECJ 4.2 has better support for Java 7 (I remember seeing issues with 3.7.2). 2) ECJ 4.2.2 does run with Java 5, I did not note any issues 3) We skipped 4.2.0 and 4.2.1. I think it should be mature enough to go on with 4.2.2. 4) One can still swap in the old ecj jar if there are any issues. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: ECJ update in Tomcat 6 (was Re: svn commit: r1476598)
On 04/27/2013 05:28 PM, Konstantin Kolinko wrote: 2013/4/27 jfcl...@apache.org: Author: jfclere Date: Sat Apr 27 15:01:03 2013 New Revision: 1476598 URL: http://svn.apache.org/r1476598 Log: more votes. Modified: tomcat/tc6.0.x/trunk/STATUS.txt * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54615 Update to Eclipse JDT Compiler 4.2.2 http://people.apache.org/~kkolinko/patches/2013-03-26_tc6_eclipse422.patch +1: kkolinko, rjung - -1: + -1: jfclere: I am ~OK to add the method to allow to compile but not to + change the major version of ecj What are your technical reasons? The problem is changing the major number of a dependency, I am afraid that brings a lot of trouble for us: we rebuild everything from their sources. Cheers Jean-Frederic - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: ECJ update in Tomcat 6 (was Re: svn commit: r1476598)
On 27/04/2013 17:05, jean-frederic clere wrote: On 04/27/2013 05:28 PM, Konstantin Kolinko wrote: 2013/4/27 jfcl...@apache.org: Author: jfclere Date: Sat Apr 27 15:01:03 2013 New Revision: 1476598 URL: http://svn.apache.org/r1476598 Log: more votes. Modified: tomcat/tc6.0.x/trunk/STATUS.txt * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54615 Update to Eclipse JDT Compiler 4.2.2 http://people.apache.org/~kkolinko/patches/2013-03-26_tc6_eclipse422.patch +1: kkolinko, rjung - -1: + -1: jfclere: I am ~OK to add the method to allow to compile but not to + change the major version of ecj What are your technical reasons? The problem is changing the major number of a dependency, I am afraid that brings a lot of trouble for us: we rebuild everything from their sources. We used to create that JAR from a large Eclipse JAR - now we just use the JAR the Eclipse project provides. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
