Re: [VOTE] Release Apache Tomcat 7.0.16
On 11.06.2011 13:33, Mark Thomas wrote: > The proposed 7.0.16 release is: > > [ ] Broken - do not release > [ ] Alpha - go ahead and release as 7.0.16 Alpha > [ ] Beta - go ahead and release as 7.0.16 Beta > [X] Stable - go ahead and release as 7.0.16 Stable +1 for stable. - MD5 OK - signatures OK - key in KEYS file - gz and zip for src and bin consistent - src consistent with svn tag X except for the additional "modules" directory in svn Not a show stopper. - builds fine - build result looks consistent with binaries - no checkstyle complaints - no Javadoc errors - Unit tests run OK for BIO, NIO and APR X Sporadic crashes for TestMapperWelcomeFiles when using APR, not a regression, now fixed by r1135208 X TestXxxEndpoint fails with APR on Solaris due to a test buglet, not a regression, now fixed by r1134938 - JMX MBean-Comparison OK X a few additional entries in tomcat.util.scan.DefaultJarScanner.jarsToSkip as expected Build and tests were done using Java 1.6.0_24, OS was Solaris 10 Sparc, tcnative was 1.1.20 based on APR 1.4.5 and OpenSSL 0.9.8r. Looks pretty good! Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51306] NPE in DeltaRequest.writeExternal(DeltaRequest.java:267) when handling remote session expiration
https://issues.apache.org/bugzilla/show_bug.cgi?id=51306 --- Comment #6 from Ronald Klop 2011-06-14 10:37:39 UTC --- Is there a workaround for this issue? What should I not do in my code to prevent this? The cause r818062 is from 2009, so I must go back very far to get a Tomcat version which doesn't have this bug, with the risk, that I get back old bugs. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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: r1135489 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java java/org/apache/tomcat/util/net/jsse/res/LocalStrings.properties webapps/docs/ch
Author: markt
Date: Tue Jun 14 11:21:53 2011
New Revision: 1135489
URL: http://svn.apache.org/viewvc?rev=1135489&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48208
Provide an option to specify a custom trust manager
Based on a patch by Luciana Moreira.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/res/LocalStrings.properties
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1135489&r1=1135488&r2=1135489&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jun 14 11:21:53 2011
@@ -97,15 +97,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: kfujino, markt
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48208
- Provide an option to specify a custom trust manager
- https://issues.apache.org/bugzilla/attachment.cgi?id=26732
- Based on a patch by Luciana Moreira.
- +1: markt
- +1: kkolinko, rjung: if a typo in the code is corrected:
-s/get("trustManageClassName")/get("trustManagerClassName")/
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50854
Allow shared manager app when running under a security manager
https://issues.apache.org/bugzilla/attachment.cgi?id=26758
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java?rev=1135489&r1=1135488&r2=1135489&view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
Tue Jun 14 11:21:53 2011
@@ -577,19 +577,48 @@ public class JSSESocketFactory
if (crlf == null) {
TrustManagerFactory tmf =
TrustManagerFactory.getInstance(algorithm);
tmf.init(trustStore);
-tms = tmf.getTrustManagers();
+tms = getTrustManagers(tmf);
} else {
TrustManagerFactory tmf =
TrustManagerFactory.getInstance(algorithm);
CertPathParameters params = getParameters(algorithm, crlf,
trustStore);
ManagerFactoryParameters mfp = new
CertPathTrustManagerParameters(params);
tmf.init(mfp);
-tms = tmf.getTrustManagers();
+tms = getTrustManagers(tmf);
}
}
return tms;
}
-
+
+/**
+ * Gets the TrustManagers either from Connector's
+ * trustManagerClassName attribute (if set) else from the
+ * {@link TrustManagerFactory}.
+ * @return The TrustManagers to use for this connector.
+ * @throws NoSuchAlgorithmException
+ * @throws ClassNotFoundException
+ * @throws IllegalAccessException
+ * @throws InstantiationException
+*/
+protected TrustManager[] getTrustManagers(TrustManagerFactory tmf)
+throws NoSuchAlgorithmException, ClassNotFoundException,
+InstantiationException, IllegalAccessException {
+
+String className = (String) attributes.get("trustManagerClassName");
+if(className != null && className.length() > 0) {
+ClassLoader classLoader = getClass().getClassLoader();
+Class clazz = classLoader.loadClass(className);
+if(!(TrustManager.class.isAssignableFrom(clazz))){
+throw new InstantiationException(sm.getString(
+"jsse.invalidTrustManagerClassName", className));
+}
+Object trustManagerObject = clazz.newInstance();
+TrustManager trustManager = (TrustManager) trustManagerObject;
+return new TrustManager[]{ trustManager };
+}
+return tmf.getTrustManagers();
+}
+
/**
* Return the initialization parameters for the TrustManager.
* Currently, only the default PKIX is supported.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/res/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/res/LocalStrings.properties?rev=1135489&r1=1135488&r2=1135489&view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/res/LocalStrings.properties
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/res/LocalStrings.properties
Tue Jun 14 11:21:53 2011
@@ -16,3 +16,4 @@
jsse.alias_no_k
DO NOT REPLY [Bug 48208] allow to configure a custom client certificate Trust Manager in server.xml per connector attribute "trustManagerClassName"
https://issues.apache.org/bugzilla/show_bug.cgi?id=48208 Mark Thomas changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||FIXED --- Comment #15 from Mark Thomas 2011-06-14 11:23:33 UTC --- This has been fixed in 6.0.x and will be included in 6.0.33 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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: r1135491 - in /tomcat/tc6.0.x/trunk: STATUS.txt conf/catalina.policy webapps/docs/changelog.xml
Author: markt
Date: Tue Jun 14 11:27:38 2011
New Revision: 1135491
URL: http://svn.apache.org/viewvc?rev=1135491&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50854
Allow shared manager app when running under a security manager
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/conf/catalina.policy
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=1135491&r1=1135490&r2=1135491&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jun 14 11:27:38 2011
@@ -97,12 +97,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: kfujino, markt
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50854
- Allow shared manager app when running under a security manager
- https://issues.apache.org/bugzilla/attachment.cgi?id=26758
- +1: markt, kkolinko, rjung
- -1:
-
* Add additional configuration options to the DIGEST authenticator
http://people.apache.org/~markt/patches/2011-04-01-digest-tc6.patch
+1: markt
Modified: tomcat/tc6.0.x/trunk/conf/catalina.policy
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/conf/catalina.policy?rev=1135491&r1=1135490&r2=1135491&view=diff
==
--- tomcat/tc6.0.x/trunk/conf/catalina.policy (original)
+++ tomcat/tc6.0.x/trunk/conf/catalina.policy Tue Jun 14 11:27:38 2011
@@ -172,12 +172,21 @@ grant {
// The Manager application needs access to the following packages to support
the
-// session display functionality
+// session display functionality. These settings support the following
+// configurations:
+// - default CATALINA_HOME == CATALINA_BASE
+// - CATALINA_HOME != CATALINA_BASE, per instance Manager in CATALINA_BASE
+// - CATALINA_HOME != CATALINA_BASE, shared Manager in CATALINA_HOME
grant codeBase "file:${catalina.base}/webapps/manager/-" {
permission java.lang.RuntimePermission
"accessClassInPackage.org.apache.catalina";
permission java.lang.RuntimePermission
"accessClassInPackage.org.apache.catalina.manager";
permission java.lang.RuntimePermission
"accessClassInPackage.org.apache.catalina.manager.util";
};
+grant codeBase "file:${catalina.home}/webapps/manager/-" {
+permission java.lang.RuntimePermission
"accessClassInPackage.org.apache.catalina";
+permission java.lang.RuntimePermission
"accessClassInPackage.org.apache.catalina.manager";
+permission java.lang.RuntimePermission
"accessClassInPackage.org.apache.catalina.manager.util";
+};
// You can assign additional permissions to particular web applications by
// adding additional "grant" entries here, based on the code base for that
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=1135491&r1=1135490&r2=1135491&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Jun 14 11:27:38 2011
@@ -211,6 +211,11 @@
Clarify error messages in *.sh files to mention that if a script is
not found it might be because execute permission is needed. (kkolinko)
+
+50854: Add additional entries to the default catalina.policy
+file to support running the manager web application from CATALINA_HOME
+or CATALINA_BASE. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50854] Additional catalina.policy entries for when Security Manager enabled, for session display functionality
https://issues.apache.org/bugzilla/show_bug.cgi?id=50854 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #3 from Mark Thomas 2011-06-14 11:27:52 UTC --- Fixed in 6.0.x and will be included in 6.0.33 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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: r1135492 - in /tomcat/tc6.0.x/trunk: STATUS.txt build.properties.default webapps/docs/changelog.xml
Author: markt
Date: Tue Jun 14 11:31:09 2011
New Revision: 1135492
URL: http://svn.apache.org/viewvc?rev=1135492&view=rev
Log:
Update download paths in build.properties.default
Use maven2 repository, because servletapi-2.3 disappeared from the maven1 repo
These downloads are needed when building extras
kkolinko
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/build.properties.default
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=1135492&r1=1135491&r2=1135492&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jun 14 11:31:09 2011
@@ -103,14 +103,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: schultz : if s/nOnce/nonce/g for the whole file, not just some of it
-1:
-* Update download paths in build.properties.default:
- Use maven2 repository, because servletapi-2.3 disappeared from the maven1
- one. These downloads are needed when building extras.
- It is backport of r1072962
- http://people.apache.org/~kkolinko/patches/2011-04-03_tc6_maven2.patch
- +1: kkolinko, markt, rjung
- -1:
-
* Backport exception logging from revision 1090022
http://svn.apache.org/viewvc?view=revision&revision=1090022
+1: schultz
Modified: tomcat/tc6.0.x/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.properties.default?rev=1135492&r1=1135491&r2=1135492&view=diff
==
--- tomcat/tc6.0.x/trunk/build.properties.default (original)
+++ tomcat/tc6.0.x/trunk/build.properties.default Tue Jun 14 11:31:09 2011
@@ -46,7 +46,7 @@ compile.debug=true
base-commons.loc=http://archive.apache.org/dist/commons
base-tomcat.loc=http://archive.apache.org/dist/tomcat
base-sf.loc=http://downloads.sourceforge.net
-base-maven1.loc=http://repo1.maven.org/maven
+base-maven.loc=http://repo2.maven.org/maven2
# - Commons Logging, version 1.1 or later -
# If this version is updated, check the versions required for the deps
@@ -62,37 +62,37 @@ commons-logging-src.tar.gz=${commons-log
# - Avalon Framework (required by commons logging) -
avalon-framework.version=4.1.3
avalon-framework.home=${base.path}/avalon-framework-${avalon-framework.version}
-avalon-framework.loc=${base-maven1.loc}/avalon-framework/jars/avalon-framework-${avalon-framework.version}.jar
+avalon-framework.loc=${base-maven.loc}/avalon-framework/avalon-framework/${avalon-framework.version}/avalon-framework-${avalon-framework.version}.jar
avalon-framework.jar=${avalon-framework.home}/avalon-framework-${avalon-framework.version}.jar
# - log4j (required by commons logging) -
log4j.version=1.2.12
log4j.home=${base.path}/log4j-${log4j.version}
-log4j.loc=${base-maven1.loc}/log4j/jars/log4j-${log4j.version}.jar
+log4j.loc=${base-maven.loc}/log4j/log4j/${log4j.version}/log4j-${log4j.version}.jar
log4j.jar=${log4j.home}/log4j-${log4j.version}.jar
# - logkit (required by commons logging) -
logkit.version=1.0.1
logkit.home=${base.path}/logkit-${logkit.version}
-logkit.loc=${base-maven1.loc}/logkit/jars/logkit-${logkit.version}.jar
+logkit.loc=${base-maven.loc}/logkit/logkit/${logkit.version}/logkit-${logkit.version}.jar
logkit.jar=${logkit.home}/logkit-${logkit.version}.jar
# - servletapi (required by commons logging) -
servletapi.version=2.3
servletapi.home=${base.path}/servletapi-${servletapi.version}
-servletapi.loc=${base-maven1.loc}/servletapi/jars/servletapi-${servletapi.version}.jar
+servletapi.loc=${base-maven.loc}/servletapi/servletapi/${servletapi.version}/servletapi-${servletapi.version}.jar
servletapi.jar=${servletapi.home}/servletapi-${servletapi.version}.jar
# - Webservices - JAX RPC -
jaxrpc-lib.version=1.1-rc4
jaxrpc-lib.home=${base.path}/jaxrpc-${jaxrpc-lib.version}
-jaxrpc-lib.loc=http://repo1.maven.org/maven2/geronimo-spec/geronimo-spec-jaxrpc/${jaxrpc-lib.version}/geronimo-spec-jaxrpc-${jaxrpc-lib.version}.jar
+jaxrpc-lib.loc=${base-maven.loc}/geronimo-spec/geronimo-spec-jaxrpc/${jaxrpc-lib.version}/geronimo-spec-jaxrpc-${jaxrpc-lib.version}.jar
jaxrpc-lib.jar=${jaxrpc-lib.home}/geronimo-spec-jaxrpc-${jaxrpc-lib.version}.jar
# - Webservices - WSDL4J -
wsdl4j-lib.version=1.6.1
wsdl4j-lib.home=${base.path}/wsdl4j-${wsdl4j-lib.version}
-wsdl4j-lib.loc=http://repo1.maven.org/maven2/wsdl4j/wsdl4j/${wsdl4j-lib.version}/wsdl4j-${wsdl4j-lib.version}.jar
+wsdl4j-lib.loc=${base-maven.loc}/wsdl4j/wsdl4j/${wsdl4j-lib.version}/wsdl4j-${wsdl4j-lib.version}.jar
wsdl4j-lib.jar=${wsdl4j-lib.home}/wsdl4j-${wsdl4j-lib.version}.jar
# - Eclipse JDT, version 3.2 or later -
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelo
svn commit: r1135494 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Tue Jun 14 11:34:17 2011 New Revision: 1135494 URL: http://svn.apache.org/viewvc?rev=1135494&view=rev Log: Proposal 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=1135494&r1=1135493&r2=1135494&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jun 14 11:34:17 2011 @@ -121,7 +121,11 @@ PATCHES PROPOSED TO BACKPORT: http://svn.apache.org/viewvc?view=revision&revision=1094069 +1: markt, schultz, rjung -0: kfujino: Is rev1097899 necessary? - http://svn.apache.org/viewvc?view=revision&revision=1097899 + -1: + +* Expose a container event for changing the session ID + http://svn.apache.org/viewvc?view=revision&revision=1097899 + +1: markt -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51220 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1135497 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/ java/org/apache/catalina/ha/session/ java/org/apache/catalina/session/ webapps/docs/
Author: markt Date: Tue Jun 14 11:41:45 2011 New Revision: 1135497 URL: http://svn.apache.org/viewvc?rev=1135497&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51042 Don't notify session creation listeners when changing session ID on authentication Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/Session.java tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/StandardSession.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 14 11:41:45 2011 @@ -1 +1 @@ -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77 0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901 39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,943112,944409,944416,945231,945808,945835,945841 ,946686,948057,950164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,961948,962865,962872,962881,962900,963106,963865,963868,964614,966177-966178,966292,966692,966863,981815,988448,991837,993042,1001955,1002185,1002263,1002274,1002349,1002359,1002362,1002481,1002514,1003461,1003481,1003488,1003556,1003572,1003581,1003861,1004393,1004409,1004415,1004868-1004869,1004912,1005452,1005467,1005647,1005802,1022120,1022134,1022323,1022415,1022606,1022623,1024224,1024251,1026042,1026784,1026912,1026920,1029767,1033415,1033448,1033842,1033897,1037715,1037794,1037887,1037924,1038041,1042022,1042029,1042447,1042452,1042494,1044944,1044987,1050249,1055055,1055236,1055458,1055975,1056264,1056828,1056889,1059881,1061412,1061442,1061446,1062398,1064652,1066244,1067039,1067139,1069824,1070139,1070420,1070609,1072042,1075458,1076212,1078409,1078412,1079801,1081334,1088179,1088460,1094089,1099586,1099
DO NOT REPLY [Bug 51042] HttpSessionListener.sessionCreated() is called a second time when user is authenticated with no matching sessionDestroyed() call.
https://issues.apache.org/bugzilla/show_bug.cgi?id=51042 --- Comment #4 from Mark Thomas 2011-06-14 11:41:58 UTC --- Fixed in 6.0.x and will be included in 6.0.33 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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: r1135498 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt
Date: Tue Jun 14 11:42:48 2011
New Revision: 1135498
URL: http://svn.apache.org/viewvc?rev=1135498&view=rev
Log:
Withdraw my proposal. Support Konstantin's alternative.
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=1135498&r1=1135497&r2=1135498&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jun 14 11:42:48 2011
@@ -139,14 +139,6 @@ PATCHES PROPOSED TO BACKPORT:
-1:
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51249
- Correct ClassLoaderLogManager system property replacement code so properties
- of the form ${...}${...} can be used without error.
- http://svn.apache.org/viewvc?rev=1130625&view=rev
- +1: markt, kkolinko
- -1:
- kkolinko: Alternative proposal below.
-
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51249
Improve system property replacement code in ClassLoaderLogManager of Tomcat
JULI.
1) Tests
svn copy "^/tomcat/trunk/test/org/apache/juli" "test/org/apache/juli"
@@ -160,7 +152,7 @@ PATCHES PROPOSED TO BACKPORT:
The old code did not perform recursion if replacement failed.
3. Do not call System.getProperty() for empty property name,
which was throwing IllegalArgumentException.
- +1: kkolinko, jung
+ +1: kkolinko, jung, markt
-1:
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51309
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1135500 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt bin/catalina.sh webapps/docs/changelog.xml
Author: markt Date: Tue Jun 14 11:48:33 2011 New Revision: 1135500 URL: http://svn.apache.org/viewvc?rev=1135500&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51309 Correct logic in catalina.sh stop when using a PID file to ensure the correct message is shown. Patch provided by Caio Cezar. Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/bin/catalina.sh tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 14 11:48:33 2011 @@ -1 +1 @@ -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77 0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901 39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,943112,944409,944416,945231,945808,945835,945841 ,946686,948057,950164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,961948,962865,962872,962881,962900,963106,963865,963868,964614,966177-966178,966292,966692,966863,981815,988448,991837,993042,1001955,1002185,1002263,1002274,1002349,1002359,1002362,1002481,1002514,1003461,1003481,1003488,1003556,1003572,1003581,1003861,1004393,1004409,1004415,1004868-1004869,1004912,1005452,1005467,1005647,1005802,1022120,1022134,1022323,1022415,1022606,1022623,1024224,1024251,1026042,1026784,1026912,1026920,1029767,1033415,1033448,1033842,1033897,1037715,1037794,1037887,1037924,1038041,1042022,1042029,1042447,1042452,1042494,1044944,1044987,1050249,1055055,1055236,1055458,1055975,1056264,1056828,1056889,1059881,1061412,1061442,1061446,1062398,1064652,1066244,1067039,1067139,1069824,1070139,1070420,1070609,1072042,1075458,1076212,1078409,1078412,1079801,1081334,1088179,1088460,1094069,1094089,1099586,1099772,1099789,1100145,1100822,1101094 ,1101144 +/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,7
DO NOT REPLY [Bug 51309] Patch to better stop support with CATALINA_PID
https://issues.apache.org/bugzilla/show_bug.cgi?id=51309 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #3 from Mark Thomas 2011-06-14 11:48:54 UTC --- This has been fixed in 6.0.x and will be included in 6.0.33 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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: r1135544 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/authenticator/AuthenticatorBase.java webapps/docs/changelog.xml
Author: markt
Date: Tue Jun 14 13:04:43 2011
New Revision: 1135544
URL: http://svn.apache.org/viewvc?rev=1135544&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51315
Removing an authenticator valve triggers an IAE
Patch provided by Violeta Georgieva
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.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=1135544&r1=1135543&r2=1135544&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jun 14 13:04:43 2011
@@ -155,13 +155,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: kkolinko, jung, markt
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51315
- Removing an authenticator valve triggers an IAE
- Patch provided by Violeta Georgieva
- https://issues.apache.org/bugzilla/show_bug.cgi?id=51315#c0
- +1: markt, kkolinko, rjung
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51348
Prevent possible NPE when processing WebDAV locks
https://issues.apache.org/bugzilla/attachment.cgi?id=27140
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java?rev=1135544&r1=1135543&r2=1135544&view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
Tue Jun 14 13:04:43 2011
@@ -273,7 +273,7 @@ public abstract class AuthenticatorBase
*/
public void setContainer(Container container) {
-if (!(container instanceof Context))
+if (container != null && !(container instanceof Context))
throw new IllegalArgumentException
(sm.getString("authenticator.notContext"));
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=1135544&r1=1135543&r2=1135544&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Jun 14 13:04:43 2011
@@ -114,6 +114,10 @@
Correct the SSLValve so it returns the SSL key size as an Integer
rather
than as a String. (markt)
+
+51315: Fix NPE when removing an authenticator valve from a
+container. Patch provided by Violeta Georgieva. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51315] Removing Valve from StandardContext causes IllegalArgumentException
https://issues.apache.org/bugzilla/show_bug.cgi?id=51315 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #2 from Mark Thomas 2011-06-14 13:05:18 UTC --- Thanks for the patch. It has been applied to 6.0.x and will be included in 6.0.33 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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: r1135548 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/servlets/WebdavServlet.java webapps/docs/changelog.xml
Author: markt
Date: Tue Jun 14 13:07:17 2011
New Revision: 1135548
URL: http://svn.apache.org/viewvc?rev=1135548&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51348
Prevent possible NPE when processing WebDAV locks
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.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=1135548&r1=1135547&r2=1135548&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jun 14 13:07:17 2011
@@ -155,12 +155,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: kkolinko, jung, markt
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51348
- Prevent possible NPE when processing WebDAV locks
- https://issues.apache.org/bugzilla/attachment.cgi?id=27140
- +1: markt, kkolinko, rjung
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51306.
Avoid NPE when handleSESSION_EXPIRED is processed while
handleSESSION_CREATED is being processed.
-setMaxInactiveInterval is not added to DeltaRequest in
handleSESSION_CREATED.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java?rev=1135548&r1=1135547&r2=1135548&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
Tue Jun 14 13:07:17 2011
@@ -1329,7 +1329,7 @@ public class WebdavServlet
LockInfo toRenew = (LockInfo) resourceLocks.get(path);
Enumeration tokenList = null;
-if (lock != null) {
+if (toRenew != null) {
// At least one of the tokens of the locks must have been given
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=1135548&r1=1135547&r2=1135548&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Jun 14 13:07:17 2011
@@ -118,6 +118,9 @@
51315: Fix NPE when removing an authenticator valve from a
container. Patch provided by Violeta Georgieva. (markt)
+
+51348: Fix possible NPE when processing WebDAV locks.
(markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51348] Potential NullPointerException in org.apache.catalina.servlets.WebdavServlet at line 1336
https://issues.apache.org/bugzilla/show_bug.cgi?id=51348 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #3 from Mark Thomas 2011-06-14 13:07:33 UTC --- Thanks again. This has been fixed in 6.0.x and will be included in 6.0.33 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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
Time for 6.0.33?
The changelog is getting quite long for 6.0.x. Is it time for another release? Jean-Frederic - are you able to RM this or do we need to find a volunteer for this one? Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51315] Removing Valve from StandardContext causes IllegalArgumentException
https://issues.apache.org/bugzilla/show_bug.cgi?id=51315 --- Comment #3 from violet...@apache.org 2011-06-14 13:16:29 UTC --- (In reply to comment #2) > Thanks for the patch. It has been applied to 6.0.x and will be included in > 6.0.33 onwards. Great!Thanks! -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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
DO NOT REPLY [Bug 51315] Removing Valve from StandardContext causes IllegalArgumentException
https://issues.apache.org/bugzilla/show_bug.cgi?id=51315 --- Comment #4 from violet...@apache.org 2011-06-14 13:26:43 UTC --- (In reply to comment #2) > Thanks for the patch. It has been applied to 6.0.x and will be included in > 6.0.33 onwards. I just checked the commit and the description of the problem is IAE not NPE :( Index: changelog.xml === --- changelog.xml(revision 113) +++ changelog.xml(working copy) @@ -115,7 +115,7 @@ than as a String. (markt) -51315: Fix NPE when removing an authenticator valve from a +51315: Fix IAE when removing an authenticator valve from a container. Patch provided by Violeta Georgieva. (markt) -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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: r1135561 - /tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Author: markt Date: Tue Jun 14 13:30:08 2011 New Revision: 1135561 URL: http://svn.apache.org/viewvc?rev=1135561&view=rev Log: Correct description 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=1135561&r1=1135560&r2=1135561&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Jun 14 13:30:08 2011 @@ -115,7 +115,7 @@ than as a String. (markt) -51315: Fix NPE when removing an authenticator valve from a +51315: Fix IAE when removing an authenticator valve from a container. Patch provided by Violeta Georgieva. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51315] Removing Valve from StandardContext causes IllegalArgumentException
https://issues.apache.org/bugzilla/show_bug.cgi?id=51315 --- Comment #5 from Mark Thomas 2011-06-14 13:30:18 UTC --- Corrected -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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
DO NOT REPLY [Bug 51315] Removing Valve from StandardContext causes IllegalArgumentException
https://issues.apache.org/bugzilla/show_bug.cgi?id=51315 --- Comment #6 from violet...@apache.org 2011-06-14 13:37:08 UTC --- (In reply to comment #5) > Corrected Thanks -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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: r1135572 - in /tomcat/tc6.0.x/trunk: java/org/apache/catalina/valves/RequestDumperValve.java webapps/docs/changelog.xml webapps/docs/config/valve.xml
Author: markt Date: Tue Jun 14 13:46:24 2011 New Revision: 1135572 URL: http://svn.apache.org/viewvc?rev=1135572&view=rev Log: CTR: Docs / Javadoc Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51346 Make clear the circumstances in which the RequestDumperValve will consume the request's InputStream. Based on a patch by pid. Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/RequestDumperValve.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml tomcat/tc6.0.x/trunk/webapps/docs/config/valve.xml Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/RequestDumperValve.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/RequestDumperValve.java?rev=1135572&r1=1135571&r2=1135572&view=diff == --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/RequestDumperValve.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/RequestDumperValve.java Tue Jun 14 13:46:24 2011 @@ -37,6 +37,11 @@ import org.apache.juli.logging.Log; * (after processing). It is especially useful in debugging problems * related to headers and cookies. * + * WARNING: Using this valve has side-effects. The output from this + * valve includes any parameters associated with the request. Therefore, the + * InputStream is consumed for requests made with the method POST and + * content-type application/x-www-form-urlencoded. + * * This Valve may be attached to any Container, depending on the granularity * of the logging you wish to perform. * 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=1135572&r1=1135571&r2=1135572&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Jun 14 13:46:24 2011 @@ -210,6 +210,11 @@ Update Maven repository information in the documentation to reflect current usage. (markt) + +51346: Update the documentation web application to make clear +the circumstances in which the RequestDumperValve will consume the +request's InputStream. Based on a patch by pid. (markt) + Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/valve.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/valve.xml?rev=1135572&r1=1135571&r2=1135572&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/config/valve.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/config/valve.xml Tue Jun 14 13:46:24 2011 @@ -353,7 +353,9 @@ output from this valve includes any parameters included with the request. The parameters will be decoded using the default platform encoding. Any subsequent calls to request.setCharacterEncoding() within -the web application will have no effect. +the web application will have no effect. NOTE: Since all parameters are +included in the output, the InputStream is consumed for requests made with +the method POST and content-type application/x-www-form-urlencoded. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51346] When RequestDumperValve is enabled, an attempt to read from InputStream from an application is failing
https://issues.apache.org/bugzilla/show_bug.cgi?id=51346 Mark Thomas changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||FIXED --- Comment #13 from Mark Thomas 2011-06-14 13:46:44 UTC --- Modified patch applied (the updated patch still ignored the content-type) to 6.0.x and will be included in 6.0.33 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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
DO NOT REPLY [Bug 51346] When RequestDumperValve is enabled, an attempt to read from InputStream from an application is failing
https://issues.apache.org/bugzilla/show_bug.cgi?id=51346 --- Comment #14 from violet...@apache.org 2011-06-14 14:17:47 UTC --- (In reply to comment #13) > Modified patch applied (the updated patch still ignored the content-type) to > 6.0.x and will be included in 6.0.33 onwards. Thanks! -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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: r1135684 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Tue Jun 14 16:30:16 2011 New Revision: 1135684 URL: http://svn.apache.org/viewvc?rev=1135684&view=rev Log: 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=1135684&r1=1135683&r2=1135684&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jun 14 16:30:16 2011 @@ -113,7 +113,26 @@ PATCHES PROPOSED TO BACKPORT: * Add StuckThreadDetectionValve https://github.com/sylvainlaurent/tomcat60/commit/252334f958877221ecb2dc64ee0fd12bb77e360b +1: slaurent + +1: kkolinko: several comments are below -1: + kkolinko: To view/download this as a patch file you add ".diff" to the URL above. That is: + https://github.com/sylvainlaurent/tomcat60/commit/252334f958877221ecb2dc64ee0fd12bb77e360b.diff + + kkolinko: Minor glitches: +- In mbeans-descriptors.xml: + - There are no properties "asyncSupported", "stateName" in TC6 version of this valve. +- In valve.xml: + - s/tomcat log/Tomcat log/ (or Apache Tomcat log) +- In StuckThreadDetectionValve.java: + - s/private class CompletedStuckThread/private static class CompletedStuckThread/ +MonitoredThread can be made static as well. + - result[i] = idList.get(i); and arguments to sm.getString() +I'd prefer the boxing/unboxing conversion to be coded explicitly. + - s/new Long(/Long.valueOf(/ + - ConcurrentHashMap: Maybe the defaults could be tuned with system properties. +I wonder whether ConcurrentHashMap.DEFAULT_CONCURRENCY_LEVEL which is 16 is enough. + - getStuckThreadIds() returns a list of ids. It might be useful to +have a similar method that returns Thread.getName() names. * Expose a container event for changing the session ID http://svn.apache.org/viewvc?view=revision&revision=1097899 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51306] NPE in DeltaRequest.writeExternal(DeltaRequest.java:267) when handling remote session expiration
https://issues.apache.org/bugzilla/show_bug.cgi?id=51306 --- Comment #7 from Filip Hanik 2011-06-15 01:50:50 UTC --- It's a bug in Tomcat, some funky cyclic implementation that I still fully don't understand. Invoking listeners on expiring sessionsmaybe valid...maybe not needed However, does this bug really cause a problem in your app? The session is going to expire no matter what, even if this error message is printed. Besides the error message in the log, is your app actually experiencing any symptoms from this? best Filip -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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: r1135892 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kfujino Date: Wed Jun 15 02:02:09 2011 New Revision: 1135892 URL: http://svn.apache.org/viewvc?rev=1135892&view=rev Log: 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=1135892&r1=1135891&r2=1135892&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jun 15 02:02:09 2011 @@ -136,7 +136,7 @@ PATCHES PROPOSED TO BACKPORT: * Expose a container event for changing the session ID http://svn.apache.org/viewvc?view=revision&revision=1097899 - +1: markt + +1: markt, kfujino -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51220 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Questions about the ajp1.3 connector
Hi, folks, I have some questions about the ajp1.3 connector. Is there any other official document for ajp1.3 connector? This url ( http://tomcat.apache.org/connectors-doc/ajp/ajpv13a.html) seems lack of something. In Send Body Chunk Packet, Is always there an extra zero byte with each packet chunk? Include the zero length chunk? I have developed a module for the AJP connection between Nginx and Tomcat( https://github.com/yaoweibin/nginx_ajp_module/tree/test_for_ferenc). But it seems there are some problems with the response body chunk Thanks.
