svn commit: r1551481 - /tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
Author: markt
Date: Tue Dec 17 08:22:16 2013
New Revision: 1551481
URL: http://svn.apache.org/r1551481
Log:
Avoid NPE on shutdown if application doesn't use WebSocket
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java?rev=1551481r1=1551480r2=1551481view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
Tue Dec 17 08:22:16 2013
@@ -451,6 +451,9 @@ public class WsServerContainer extends W
void shutdownExecutor() {
+if (executorService == null) {
+return;
+}
executorService.shutdown();
try {
executorService.awaitTermination(10, TimeUnit.SECONDS);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1551482 - /tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
Author: markt
Date: Tue Dec 17 08:27:50 2013
New Revision: 1551482
URL: http://svn.apache.org/r1551482
Log:
Avoid a warning that executor hasn't shutdown yet if the endpoint is not
configured to wait for the executor to shutdown. (BIO is configured not to wait
by default as threads in keep-alive can't be interrupted.)
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=1551482r1=1551481r2=1551482view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Tue Dec
17 08:27:50 2013
@@ -521,14 +521,16 @@ public abstract class AbstractEndpointS
//this is our internal one, so we need to shut it down
ThreadPoolExecutor tpe = (ThreadPoolExecutor) executor;
tpe.shutdownNow();
-try {
-tpe.awaitTermination(getExecutorTerminationTimeoutMillis(),
-TimeUnit.MILLISECONDS);
-} catch (InterruptedException e) {
-// Ignore
-}
-if (tpe.isTerminating()) {
-
getLog().warn(sm.getString(endpoint.warn.executorShutdown, getName()));
+long timeout = getExecutorTerminationTimeoutMillis();
+if (timeout 0) {
+try {
+tpe.awaitTermination(timeout, TimeUnit.MILLISECONDS);
+} catch (InterruptedException e) {
+// Ignore
+}
+if (tpe.isTerminating()) {
+
getLog().warn(sm.getString(endpoint.warn.executorShutdown, getName()));
+}
}
TaskQueue queue = (TaskQueue) tpe.getQueue();
queue.setParent(null);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1551483 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/websocket/server/WsServerContainer.java
Author: markt
Date: Tue Dec 17 08:28:25 2013
New Revision: 1551483
URL: http://svn.apache.org/r1551483
Log:
Avoid NPE on shutdown if application isn't using WebSocket.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1551481
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java?rev=1551483r1=1551482r2=1551483view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
Tue Dec 17 08:28:25 2013
@@ -454,6 +454,9 @@ public class WsServerContainer extends W
void shutdownExecutor() {
+if (executorService == null) {
+return;
+}
executorService.shutdown();
try {
executorService.awaitTermination(10, TimeUnit.SECONDS);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1551485 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/net/AbstractEndpoint.java webapps/docs/changelog.xml
Author: markt
Date: Tue Dec 17 08:37:11 2013
New Revision: 1551485
URL: http://svn.apache.org/r1551485
Log:
Avoid expected warning
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1551482
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=1551485r1=1551484r2=1551485view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
Tue Dec 17 08:37:11 2013
@@ -522,14 +522,16 @@ public abstract class AbstractEndpoint {
//this is our internal one, so we need to shut it down
ThreadPoolExecutor tpe = (ThreadPoolExecutor) executor;
tpe.shutdownNow();
-try {
-tpe.awaitTermination(getExecutorTerminationTimeoutMillis(),
-TimeUnit.MILLISECONDS);
-} catch (InterruptedException e) {
-// Ignore
-}
-if (tpe.isTerminating()) {
-
getLog().warn(sm.getString(endpoint.warn.executorShutdown, getName()));
+long timeout = getExecutorTerminationTimeoutMillis();
+if (timeout 0) {
+try {
+tpe.awaitTermination(timeout, TimeUnit.MILLISECONDS);
+} catch (InterruptedException e) {
+// Ignore
+}
+if (tpe.isTerminating()) {
+
getLog().warn(sm.getString(endpoint.warn.executorShutdown, getName()));
+}
}
TaskQueue queue = (TaskQueue) tpe.getQueue();
queue.setParent(null);
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=1551485r1=1551484r2=1551485view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Dec 17 08:37:11 2013
@@ -83,6 +83,17 @@
/fix
/changelog
/subsection
+ subsection name=Coyote
+changelog
+ fix
+When using the BIO connector with an internal executor, do not display
a
+warning that the executor has not shutdown as the default configuration
+for BIO connectors is not to wait. This is because threads in
+keep-alive connections cannot be interrupted and therefore the warning
+was nearly always displayed. (markt)
+ /fix
+/changelog
+ /subsection
subsection name=Cluster
changelog
fix
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1551494 - /tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
Author: kfujino Date: Tue Dec 17 09:28:14 2013 New Revision: 1551494 URL: http://svn.apache.org/r1551494 Log: Add time stamp to GET_ALL_SESSION message. Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=1551494r1=1551493r2=1551494view=diff == --- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java (original) +++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java Tue Dec 17 09:28:14 2013 @@ -823,6 +823,7 @@ public class DeltaManager extends Cluste } SessionMessage msg = new SessionMessageImpl(this.getName(), SessionMessage.EVT_GET_ALL_SESSIONS, null, GET-ALL, GET-ALL- + getName()); +msg.setTimestamp(beforeSendTime); // set reference time stateTransferCreateSendTime = beforeSendTime ; // request session state - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1551495 - in /tomcat/tc7.0.x/trunk: java/org/apache/catalina/ha/session/DeltaManager.java webapps/docs/changelog.xml
Author: kfujino Date: Tue Dec 17 09:29:36 2013 New Revision: 1551495 URL: http://svn.apache.org/r1551495 Log: Add time stamp to GET_ALL_SESSION message. Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=1551495r1=1551494r2=1551495view=diff == --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java Tue Dec 17 09:29:36 2013 @@ -805,6 +805,7 @@ public class DeltaManager extends Cluste return; } SessionMessage msg = new SessionMessageImpl(this.getName(),SessionMessage.EVT_GET_ALL_SESSIONS, null, GET-ALL,GET-ALL- + getName()); +msg.setTimestamp(beforeSendTime); // set reference time stateTransferCreateSendTime = beforeSendTime ; // request session state 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=1551495r1=1551494r2=1551495view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Dec 17 09:29:36 2013 @@ -104,6 +104,9 @@ added to member map again by ping at heartbeat thread in the node that received the codeMapMessage.MSG_STOP/code. (kfujino) /fix + fix +Add time stamp to codeGET_ALL_SESSION/code message. (kfujino) + /fix /changelog /subsection subsection name=Web applications - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Current sporadic test suite failures
I ran the test suite 10 times for each connector and for TC 7 and trunk (yesterdays svn revision). I got some sporadic failures on my Solaris 10 system using JDK 1.6.0_45 (TC 7) resp. 1.7.0_45 (trunk). A)1) might be a timing issue and B)1) timing/flushing, so both could well be false positives. A)2)-A)4) are all websocket tests. A) TC 7 === 1) org.apache.catalina.loader.TestWebappClassLoaderMemoryLeak - 1 x apr, 3 x bio, 4 x nio Failure: Testcase: testTimerThreadLeak took 3.724 sec FAILED Timer thread still running junit.framework.AssertionFailedError: Timer thread still running at org.apache.catalina.loader.TestWebappClassLoaderMemoryLeak.testTimerThreadLeak(TestWebappClassLoaderMemoryLeak.java:72) Log always like: Dec 16, 2013 8:35:12 PM org.apache.coyote.AbstractProtocol init INFO: Initializing ProtocolHandler [http-nio-127.0.0.1-auto-1] Dec 16, 2013 8:35:12 PM org.apache.tomcat.util.net.NioSelectorPool getSharedSelector INFO: Using a shared selector for servlet write/read Dec 16, 2013 8:35:12 PM org.apache.catalina.core.StandardService startInternal INFO: Starting service Tomcat Dec 16, 2013 8:35:12 PM org.apache.catalina.core.StandardEngine startInternal INFO: Starting Servlet Engine: Apache Tomcat/7.0.X-rXX-dev Dec 16, 2013 8:35:13 PM org.apache.catalina.util.SessionIdGenerator createSecureRandom INFO: Creation of SecureRandom instance for session ID generation using [INSECURE] took [427] milliseconds. Dec 16, 2013 8:35:13 PM org.apache.coyote.AbstractProtocol start INFO: Starting ProtocolHandler [http-nio-127.0.0.1-auto-1-53581] Dec 16, 2013 8:35:14 PM org.apache.catalina.loader.WebappClassLoader clearReferencesStopTimerThread SEVERE: The web application [] appears to have started a TimerThread named [leaked-thread] via the java.util.Timer API but has failed to stop it. To prevent a memory leak, the t imer (and hence the associated thread) has been forcibly canceled. Dec 16, 2013 8:35:14 PM org.apache.coyote.AbstractProtocol pause INFO: Pausing ProtocolHandler [http-nio-127.0.0.1-auto-1-53581] Dec 16, 2013 8:35:14 PM org.apache.catalina.core.StandardService stopInternal INFO: Stopping service Tomcat Dec 16, 2013 8:35:14 PM org.apache.coyote.AbstractProtocol stop INFO: Stopping ProtocolHandler [http-nio-127.0.0.1-auto-1-53581] Dec 16, 2013 8:35:14 PM org.apache.coyote.AbstractProtocol destroy INFO: Destroying ProtocolHandler [http-nio-127.0.0.1-auto-1-53581] Next steps: I'll increase the 10ms timeout locally and report back, whether that helps. 2) org.apache.catalina.websocket.TestWebSocket -- 2 x bio, 1 x nio Failure: Testcase: testBug53339 took 10.309 sec Caused an ERROR Read timed out java.net.SocketTimeoutException: Read timed out at java.net.SocketInputStream.socketRead0(Native Method) at java.net.SocketInputStream.read(SocketInputStream.java:152) at java.net.SocketInputStream.read(SocketInputStream.java:122) at java.net.SocketInputStream.read(SocketInputStream.java:210) at org.apache.catalina.websocket.TestWebSocket$WebSocketClient.readMessage(TestWebSocket.java:456) at org.apache.catalina.websocket.TestWebSocket$WebSocketClient.access$300(TestWebSocket.java:383) at org.apache.catalina.websocket.TestWebSocket.testBug53339(TestWebSocket.java:327) Log seems not to contain anything relevant: Dec 16, 2013 9:34:10 PM org.apache.coyote.AbstractProtocol init INFO: Initializing ProtocolHandler [http-bio-127.0.0.1-auto-2] Dec 16, 2013 9:34:10 PM org.apache.catalina.core.StandardService startInternal INFO: Starting service Tomcat Dec 16, 2013 9:34:10 PM org.apache.catalina.core.StandardEngine startInternal INFO: Starting Servlet Engine: Apache Tomcat/7.0.X-rXX-dev Dec 16, 2013 9:34:10 PM org.apache.coyote.AbstractProtocol start INFO: Starting ProtocolHandler [http-bio-127.0.0.1-auto-2-58747] Dec 16, 2013 9:34:20 PM org.apache.coyote.AbstractProtocol pause INFO: Pausing ProtocolHandler [http-bio-127.0.0.1-auto-2-58747] Dec 16, 2013 9:34:21 PM org.apache.catalina.core.StandardService stopInternal INFO: Stopping service Tomcat Next steps: I'll add some debug output locally to WebSocketClient especially readMessage() and see how far I get. 3) org.apache.tomcat.websocket.TestWsSubprotocols - 1 x bio, 1 x nio Failure: Testcase: testWsSubprotocols took 4.005 sec Caused an ERROR null java.lang.NullPointerException at org.apache.tomcat.websocket.TestWsSubprotocols.testWsSubprotocols(TestWsSubprotocols.java:89) Logs: Nothing interesting Next steps: I'll add some debug logs locally to TestWsSubprotocols and see how far I get. 4) org.apache.tomcat.websocket.pojo.TestPojoEndpointBase 1 x apr Failure: Testcase: testOnOpenPojoMethod took 5.853 sec Caused an ERROR The
buildbot failure in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a new failure on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/1643 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1551485 Blamelist: markt BUILD FAILED: failed compile_1 sincerely, -The Buildbot
buildbot failure in ASF Buildbot on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/5341 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1551481 Blamelist: markt BUILD FAILED: failed compile_1 sincerely, -The Buildbot
svn commit: r1551508 - in /tomcat/tags/TOMCAT_8_0_0_RC8: ./ build.properties.default res/maven/mvn.properties.default
Author: markt Date: Tue Dec 17 10:57:07 2013 New Revision: 1551508 URL: http://svn.apache.org/r1551508 Log: Tag 8.0.0-RC8 Added: tomcat/tags/TOMCAT_8_0_0_RC8/ - copied from r1551507, tomcat/trunk/ Modified: tomcat/tags/TOMCAT_8_0_0_RC8/build.properties.default tomcat/tags/TOMCAT_8_0_0_RC8/res/maven/mvn.properties.default Modified: tomcat/tags/TOMCAT_8_0_0_RC8/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/tags/TOMCAT_8_0_0_RC8/build.properties.default?rev=1551508r1=1551507r2=1551508view=diff == --- tomcat/tags/TOMCAT_8_0_0_RC8/build.properties.default (original) +++ tomcat/tags/TOMCAT_8_0_0_RC8/build.properties.default Tue Dec 17 10:57:07 2013 @@ -29,7 +29,7 @@ version.major=8 version.minor=0 version.build=0 version.patch=0 -version.suffix=-dev +version.suffix=-RC8 # - Build control flags - # Note enabling validation uses Checkstyle which is LGPL licensed Modified: tomcat/tags/TOMCAT_8_0_0_RC8/res/maven/mvn.properties.default URL: http://svn.apache.org/viewvc/tomcat/tags/TOMCAT_8_0_0_RC8/res/maven/mvn.properties.default?rev=1551508r1=1551507r2=1551508view=diff == --- tomcat/tags/TOMCAT_8_0_0_RC8/res/maven/mvn.properties.default (original) +++ tomcat/tags/TOMCAT_8_0_0_RC8/res/maven/mvn.properties.default Tue Dec 17 10:57:07 2013 @@ -35,7 +35,7 @@ maven.asf.release.repo.url=https://repos maven.asf.release.repo.repositoryId=apache.releases # Release version info -maven.asf.release.deploy.version=8.0.0 +maven.asf.release.deploy.version=8.0.0-RC8 #Where do we load the libraries from tomcat.lib.path=../../output/build/lib - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a restored build on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/1644 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1551495 Blamelist: kfujino Build succeeded! sincerely, -The Buildbot
[VOTE] Release Apache Tomcat 8.0.0-RC8
The proposed Apache Tomcat 8.0.0 release candidate 8 is now available for voting. Given this is a release candidate I am working on the basis that it is equivalent to an alpha. The main changes since RC5 are: - Better handling of generic types in the WebSocket 1.0 implementation - Refactor resource handling for the class loader - Add Cobertura support to the unit tests - Remove anti-Jar locking feature and replace it with open stream tracking - Update to a post Commons Pool 2.0 release snapshot - Complete refactoring of TLD handling including caching of parsed TLDs - More consistent handling of XML validation options - Much more detailed visibility of DBCP connections pools in JMX - Better organisation of JMX beans in the default JConsole view - Performance improvements - Numerous bug fixes It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.0.0-RC8/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-052/ The svn tag is: http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_8_0_0_RC8/ The proposed 8.0.0-RC8 release is: [ ] Broken - do not release [ ] Alpha - go ahead and release as 8.0.0-RC8 alpha Cheers, Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r3926 [2/2] - in /dev/tomcat/tomcat-8: v8.0.0-RC7/ v8.0.0-RC8/ v8.0.0-RC8/bin/ v8.0.0-RC8/bin/embed/ v8.0.0-RC8/bin/extras/ v8.0.0-RC8/src/
Added: dev/tomcat/tomcat-8/v8.0.0-RC8/src/apache-tomcat-8.0.0-RC8-src.tar.gz.asc == --- dev/tomcat/tomcat-8/v8.0.0-RC8/src/apache-tomcat-8.0.0-RC8-src.tar.gz.asc (added) +++ dev/tomcat/tomcat-8/v8.0.0-RC8/src/apache-tomcat-8.0.0-RC8-src.tar.gz.asc Tue Dec 17 11:45:08 2013 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1.4.9 (MingW32) + +iQIcBAABAgAGBQJSsDGpAAoJEBDAHFovYFnnsU0P/jEw4dAbTVtubKApk269sdBx +soC3Nn0918L5/p1zdn55BhdKB0nUFad2a38LGYmFgjmlznJ6pFtMRFOekSWmFNeh +SgXMvZ9BHnZ7/ODptI9YTzrYHccFb8tuoTDqb15cAAV35lJ3WHDhKsLdMSfv2N9s +cQnOsL6Aj+KVFGMdvGplPiZrsXBpFNEAGw9nUjbbwoLDsdrNJgwXs6mugkGw3W7O +67LypTEefJjNbDvSsFw4+BMc8kil2AARoSyxizL+yts2B4JwLtVEoZOZ3v21XR/Y +W4ej6dgrU/nKHMcEIN9SxrTetzAwKM/2d+Gyx7oqGIrR/y3cJ77JpJAG2zupv+GQ +NNuV79Fuiulhek5qWkI424Lk08HgRJu9Ob7raptFgqCgRMBpEA1G5P5q8J/aQDaY +jp5+jhRqxRxCjDwQHaESnn8WyhpEcY0N/xdmnH6Y4P+bRngQl5xKVZpa4hRfdKP1 +OR8+qCYW/hZ1AKqwHH0nv4Tf5IVj8uBpPdneOKcMpcR54tu70NUs94fGnKIh3t58 +ej/62VFaPlGLbAwJEkqmxLyleS8XAejDd1LNoWOdJpRexqllNM3EawNB8jwVcN6Z +T++FFQlXEGE8BpP/taEa9bt1ShlWq8+yRQcYDFTJfXjocX1goOlsZG7l0sgIR8Cu +OdMN70zHoqrnFFmbwxIc +=IHz3 +-END PGP SIGNATURE- Added: dev/tomcat/tomcat-8/v8.0.0-RC8/src/apache-tomcat-8.0.0-RC8-src.tar.gz.md5 == --- dev/tomcat/tomcat-8/v8.0.0-RC8/src/apache-tomcat-8.0.0-RC8-src.tar.gz.md5 (added) +++ dev/tomcat/tomcat-8/v8.0.0-RC8/src/apache-tomcat-8.0.0-RC8-src.tar.gz.md5 Tue Dec 17 11:45:08 2013 @@ -0,0 +1 @@ +204d054cfa5778dec29b9b587c3223d1 *apache-tomcat-8.0.0-RC8-src.tar.gz \ No newline at end of file Added: dev/tomcat/tomcat-8/v8.0.0-RC8/src/apache-tomcat-8.0.0-RC8-src.zip == Binary file - no diff available. Propchange: dev/tomcat/tomcat-8/v8.0.0-RC8/src/apache-tomcat-8.0.0-RC8-src.zip -- svn:mime-type = application/octet-stream Added: dev/tomcat/tomcat-8/v8.0.0-RC8/src/apache-tomcat-8.0.0-RC8-src.zip.asc == --- dev/tomcat/tomcat-8/v8.0.0-RC8/src/apache-tomcat-8.0.0-RC8-src.zip.asc (added) +++ dev/tomcat/tomcat-8/v8.0.0-RC8/src/apache-tomcat-8.0.0-RC8-src.zip.asc Tue Dec 17 11:45:08 2013 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1.4.9 (MingW32) + +iQIcBAABAgAGBQJSsDGQAAoJEBDAHFovYFnnyxUQALKBSgngn04QMuGtcWaVZLyz +wz1tewjQYhJxOO4ls/MyXp+eJm1mn/DC1LleeMPLQH97lfcjRG2atXZ38AWz0q7L +FXN+rBBsSOBGh7yKuHUnaQSsHygSe6C52Gmv1x2kMxKSxYe7aKj0+m9CRX7DYl+k +y6f6XChBu/yw+JWWVcwzGwyPgH0UkDPj5BtYG2UUe+tcbleAcopK3RemUuxpHWQD +PdIWqusyL7mfVDiWFgeEcPXbx71YglaZpyN3PSa10iL+d88kr/5uyZH1R94Vn2LL +qG0Y8r8ZhOvh4m7zNl2eLWYccbd08dLK9N9RhNW3tR+C64aL8uaq9Y4pVqxaTOXF +MD22wVVosNb5wy4z5mg4VA3UBiPgWioBu+es8PGFGlVasoy4NJwY3sDCtYbHA4NT +tCvCOF9Azm6A0F6vBDk/0syT3d/A97FwOElSsvJsHZia5p2R6LYeYiBwmOQwWvJ7 +LHL6IeHgcvwHRoWv9QQJnov0AQegY4oMhFoty+CiVzHjeZtllIgbaiVGhYhRqzwJ +hDSnfzxokWfqnE7MpNV0sEulfNgBw0QMArPoJX5N04ow3Z/JPUHwQPFpy9tkBXyD +ozMLJ6XMUkrvtbYZd8BEkOhzmcYMa9yS3vkXnE9PTGp7ybXdolvaGNI01IirL267 +NXvpzjHdpAZneaEwYhHX +=hpGX +-END PGP SIGNATURE- Added: dev/tomcat/tomcat-8/v8.0.0-RC8/src/apache-tomcat-8.0.0-RC8-src.zip.md5 == --- dev/tomcat/tomcat-8/v8.0.0-RC8/src/apache-tomcat-8.0.0-RC8-src.zip.md5 (added) +++ dev/tomcat/tomcat-8/v8.0.0-RC8/src/apache-tomcat-8.0.0-RC8-src.zip.md5 Tue Dec 17 11:45:08 2013 @@ -0,0 +1 @@ +856e89be05bbeadcef8529acbfce9819 *apache-tomcat-8.0.0-RC8-src.zip \ No newline at end of file - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r3926 [2/2] - in /dev/tomcat/tomcat-8: v8.0.0-RC7/ v8.0.0-RC8/ v8.0.0-RC8/bin/ v8.0.0-RC8/bin/embed/ v8.0.0-RC8/bin/extras/ v8.0.0-RC8/src/
Added: dev/tomcat/tomcat-8/v8.0.0-RC8/src/apache-tomcat-8.0.0-RC8-src.tar.gz.asc == --- dev/tomcat/tomcat-8/v8.0.0-RC8/src/apache-tomcat-8.0.0-RC8-src.tar.gz.asc (added) +++ dev/tomcat/tomcat-8/v8.0.0-RC8/src/apache-tomcat-8.0.0-RC8-src.tar.gz.asc Tue Dec 17 11:45:08 2013 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1.4.9 (MingW32) + +iQIcBAABAgAGBQJSsDGpAAoJEBDAHFovYFnnsU0P/jEw4dAbTVtubKApk269sdBx +soC3Nn0918L5/p1zdn55BhdKB0nUFad2a38LGYmFgjmlznJ6pFtMRFOekSWmFNeh +SgXMvZ9BHnZ7/ODptI9YTzrYHccFb8tuoTDqb15cAAV35lJ3WHDhKsLdMSfv2N9s +cQnOsL6Aj+KVFGMdvGplPiZrsXBpFNEAGw9nUjbbwoLDsdrNJgwXs6mugkGw3W7O +67LypTEefJjNbDvSsFw4+BMc8kil2AARoSyxizL+yts2B4JwLtVEoZOZ3v21XR/Y +W4ej6dgrU/nKHMcEIN9SxrTetzAwKM/2d+Gyx7oqGIrR/y3cJ77JpJAG2zupv+GQ +NNuV79Fuiulhek5qWkI424Lk08HgRJu9Ob7raptFgqCgRMBpEA1G5P5q8J/aQDaY +jp5+jhRqxRxCjDwQHaESnn8WyhpEcY0N/xdmnH6Y4P+bRngQl5xKVZpa4hRfdKP1 +OR8+qCYW/hZ1AKqwHH0nv4Tf5IVj8uBpPdneOKcMpcR54tu70NUs94fGnKIh3t58 +ej/62VFaPlGLbAwJEkqmxLyleS8XAejDd1LNoWOdJpRexqllNM3EawNB8jwVcN6Z +T++FFQlXEGE8BpP/taEa9bt1ShlWq8+yRQcYDFTJfXjocX1goOlsZG7l0sgIR8Cu +OdMN70zHoqrnFFmbwxIc +=IHz3 +-END PGP SIGNATURE- Added: dev/tomcat/tomcat-8/v8.0.0-RC8/src/apache-tomcat-8.0.0-RC8-src.tar.gz.md5 == --- dev/tomcat/tomcat-8/v8.0.0-RC8/src/apache-tomcat-8.0.0-RC8-src.tar.gz.md5 (added) +++ dev/tomcat/tomcat-8/v8.0.0-RC8/src/apache-tomcat-8.0.0-RC8-src.tar.gz.md5 Tue Dec 17 11:45:08 2013 @@ -0,0 +1 @@ +204d054cfa5778dec29b9b587c3223d1 *apache-tomcat-8.0.0-RC8-src.tar.gz \ No newline at end of file Added: dev/tomcat/tomcat-8/v8.0.0-RC8/src/apache-tomcat-8.0.0-RC8-src.zip == Binary file - no diff available. Propchange: dev/tomcat/tomcat-8/v8.0.0-RC8/src/apache-tomcat-8.0.0-RC8-src.zip -- svn:mime-type = application/octet-stream Added: dev/tomcat/tomcat-8/v8.0.0-RC8/src/apache-tomcat-8.0.0-RC8-src.zip.asc == --- dev/tomcat/tomcat-8/v8.0.0-RC8/src/apache-tomcat-8.0.0-RC8-src.zip.asc (added) +++ dev/tomcat/tomcat-8/v8.0.0-RC8/src/apache-tomcat-8.0.0-RC8-src.zip.asc Tue Dec 17 11:45:08 2013 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1.4.9 (MingW32) + +iQIcBAABAgAGBQJSsDGQAAoJEBDAHFovYFnnyxUQALKBSgngn04QMuGtcWaVZLyz +wz1tewjQYhJxOO4ls/MyXp+eJm1mn/DC1LleeMPLQH97lfcjRG2atXZ38AWz0q7L +FXN+rBBsSOBGh7yKuHUnaQSsHygSe6C52Gmv1x2kMxKSxYe7aKj0+m9CRX7DYl+k +y6f6XChBu/yw+JWWVcwzGwyPgH0UkDPj5BtYG2UUe+tcbleAcopK3RemUuxpHWQD +PdIWqusyL7mfVDiWFgeEcPXbx71YglaZpyN3PSa10iL+d88kr/5uyZH1R94Vn2LL +qG0Y8r8ZhOvh4m7zNl2eLWYccbd08dLK9N9RhNW3tR+C64aL8uaq9Y4pVqxaTOXF +MD22wVVosNb5wy4z5mg4VA3UBiPgWioBu+es8PGFGlVasoy4NJwY3sDCtYbHA4NT +tCvCOF9Azm6A0F6vBDk/0syT3d/A97FwOElSsvJsHZia5p2R6LYeYiBwmOQwWvJ7 +LHL6IeHgcvwHRoWv9QQJnov0AQegY4oMhFoty+CiVzHjeZtllIgbaiVGhYhRqzwJ +hDSnfzxokWfqnE7MpNV0sEulfNgBw0QMArPoJX5N04ow3Z/JPUHwQPFpy9tkBXyD +ozMLJ6XMUkrvtbYZd8BEkOhzmcYMa9yS3vkXnE9PTGp7ybXdolvaGNI01IirL267 +NXvpzjHdpAZneaEwYhHX +=hpGX +-END PGP SIGNATURE- Added: dev/tomcat/tomcat-8/v8.0.0-RC8/src/apache-tomcat-8.0.0-RC8-src.zip.md5 == --- dev/tomcat/tomcat-8/v8.0.0-RC8/src/apache-tomcat-8.0.0-RC8-src.zip.md5 (added) +++ dev/tomcat/tomcat-8/v8.0.0-RC8/src/apache-tomcat-8.0.0-RC8-src.zip.md5 Tue Dec 17 11:45:08 2013 @@ -0,0 +1 @@ +856e89be05bbeadcef8529acbfce9819 *apache-tomcat-8.0.0-RC8-src.zip \ No newline at end of file - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55891] Tomcat 7 EL Parser does not correctly evaluates nested JSF 2.2 ui:repeat values
https://issues.apache.org/bugzilla/show_bug.cgi?id=55891
Mark Thomas ma...@apache.org changed:
What|Removed |Added
OS||All
--- Comment #2 from Mark Thomas ma...@apache.org ---
Any further pointers you can provide as to what Tomcat is doing wrong? I've
traced through the calls into the EL in Tomcat 7 and Tomcat 8 and the call
patterns are very different (there are more calls in 8 than 7).
There are multiple evaluations of #{b.checked} (which itself looks wrong) in
both 7 and 8. In Tomcat 8, it doesn't return a non-null value until the 3rd
call. In Tomcat 7 that third call is never made.
I'm currently comparing the Tomcat 7 and 8 calls but any pointers would be a
help here.
--
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 55891] Tomcat 7 EL Parser does not correctly evaluates nested JSF 2.2 ui:repeat values
https://issues.apache.org/bugzilla/show_bug.cgi?id=55891
Mark Thomas ma...@apache.org changed:
What|Removed |Added
Status|NEW |RESOLVED
Resolution|--- |INVALID
--- Comment #3 from Mark Thomas ma...@apache.org ---
I've tracked this down. There is no Tomcat bug here. You have been bitten by a
difference between EL 2.2 and EL 3.0 (which is why it worked in Tomcat 7 when
you used the EL 3.0 implementation from Glassfish 4).
In EL 2.2 attempting to coerce a null to a Boolean results in Boolean.FALSE.
In EL 3.0 attempting to coerce a null to a Boolean results in null.
In Tomcat 7 the attempts to resolve #{b.checked} returns null which is coerced
to Boolean.FALSE which appears to prevent the 3rd resolution attempt (the one
that works in Tomcat 8).
The multiple resolution attempts still look odd but regardless of whether JSF
is doing the right thing there, Tomcat's EL implementation in Tomcat 7 is
behaving as per the EL 2.2 spec and in Tomcat 8 it is behaving as per the 3.0
spec. See section A.4 of the EL 3.0 spec for the details of this change.
--
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
New JDK 8 tool: jdeps
Hi Mladen, Here's a blog from Erik Costlow on a new tool in JDK 8 that lets you analyze your code for dependencies on JDK internal APIs : https://blogs.oracle.com/java-platform-group/entry/closing_the_closed_apis Please let me know if you have any feedback - I'd be interested to hear if you use any internal APIs. Rgds,Rory -- Rgds,Rory O'Donnell Quality Engineering Manager Oracle EMEA , Dublin, Ireland - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55891] Tomcat 7 EL Parser does not correctly evaluates nested JSF 2.2 ui:repeat values
https://issues.apache.org/bugzilla/show_bug.cgi?id=55891 --- Comment #4 from Paul Khodchenkov werde...@gmail.com --- Hi Mark, Thanks for the explanation. Is it safe to use the latest el jar from tomcat 8 in tomcat 7 to solve this issue with JSF 2.2? -- 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: r1551546 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/loader/TestWebappClassLoaderMemoryLeak.java
Author: rjung
Date: Tue Dec 17 14:09:52 2013
New Revision: 1551546
URL: http://svn.apache.org/r1551546
Log:
Reduce timing sensitivity of test as some false
positives have been observed.
Backport of r1521444 from trunk.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderMemoryLeak.java
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1521444
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderMemoryLeak.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderMemoryLeak.java?rev=1551546r1=1551545r2=1551546view=diff
==
---
tomcat/tc7.0.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderMemoryLeak.java
(original)
+++
tomcat/tc7.0.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderMemoryLeak.java
Tue Dec 17 14:09:52 2013
@@ -59,17 +59,18 @@ public class TestWebappClassLoaderMemory
// Stop the context
ctx.stop();
-// If the thread still exists, we have a thread/memory leak
-try {
-Thread.sleep(10);
-} catch(InterruptedException ie) {
-// ignore
-}
Thread[] threads = getThreads();
for (Thread thread : threads) {
-if (thread != null
+if (thread != null thread.isAlive()
TaskServlet.TIMER_THREAD_NAME.equals(thread.getName())) {
-fail(Timer thread still running);
+int count = 0;
+while (count 50 thread.isAlive()) {
+Thread.sleep(100);
+count++;
+}
+if (thread.isAlive()) {
+fail(Timer thread still running);
+}
}
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 8.0.0-RC8
On Dec 17, 2013, at 6:32 AM, Mark Thomas ma...@apache.org wrote: The proposed Apache Tomcat 8.0.0 release candidate 8 is now available for voting. Given this is a release candidate I am working on the basis that it is equivalent to an alpha. The main changes since RC5 are: - Better handling of generic types in the WebSocket 1.0 implementation - Refactor resource handling for the class loader - Add Cobertura support to the unit tests - Remove anti-Jar locking feature and replace it with open stream tracking - Update to a post Commons Pool 2.0 release snapshot - Complete refactoring of TLD handling including caching of parsed TLDs - More consistent handling of XML validation options - Much more detailed visibility of DBCP connections pools in JMX - Better organisation of JMX beans in the default JConsole view - Performance improvements - Numerous bug fixes It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.0.0-RC8/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-052/ The svn tag is: http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_8_0_0_RC8/ The proposed 8.0.0-RC8 release is: [ ] Broken - do not release [ ] Alpha - go ahead and release as 8.0.0-RC8 alpha Cheers, Mark I'm seeing the following error when running with a security manager enabled. $ cat logs/catalina.out java.lang.ClassNotFoundException: org.apache.tomcat.util.net.AbstractEndpoint$PrivilegedSetTccl at java.net.URLClassLoader$1.run(URLClassLoader.java:366) at java.net.URLClassLoader$1.run(URLClassLoader.java:355) at java.security.AccessController.doPrivileged(Native Method) at java.net.URLClassLoader.findClass(URLClassLoader.java:354) at java.lang.ClassLoader.loadClass(ClassLoader.java:425) at java.lang.ClassLoader.loadClass(ClassLoader.java:358) at org.apache.catalina.security.SecurityClassLoad.loadTomcatPackage(SecurityClassLoad.java:283) at org.apache.catalina.security.SecurityClassLoad.securityClassLoad(SecurityClassLoad.java:49) at org.apache.catalina.startup.Bootstrap.init(Bootstrap.java:261) at org.apache.catalina.startup.Bootstrap.main(Bootstrap.java:456) Steps to reproduce: 1.) Download and unzip. 2.) ./bin/startup.sh -security 3.) cat logs/catalina.out Dan - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 8.0.0-RC8
On 17/12/2013 14:27, Daniel Mikusa wrote: On Dec 17, 2013, at 6:32 AM, Mark Thomas ma...@apache.org wrote: The proposed Apache Tomcat 8.0.0 release candidate 8 is now available for voting. Given this is a release candidate I am working on the basis that it is equivalent to an alpha. The main changes since RC5 are: - Better handling of generic types in the WebSocket 1.0 implementation - Refactor resource handling for the class loader - Add Cobertura support to the unit tests - Remove anti-Jar locking feature and replace it with open stream tracking - Update to a post Commons Pool 2.0 release snapshot - Complete refactoring of TLD handling including caching of parsed TLDs - More consistent handling of XML validation options - Much more detailed visibility of DBCP connections pools in JMX - Better organisation of JMX beans in the default JConsole view - Performance improvements - Numerous bug fixes It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.0.0-RC8/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-052/ The svn tag is: http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_8_0_0_RC8/ The proposed 8.0.0-RC8 release is: [ ] Broken - do not release [ ] Alpha - go ahead and release as 8.0.0-RC8 alpha Cheers, Mark I'm seeing the following error when running with a security manager enabled. $ cat logs/catalina.out java.lang.ClassNotFoundException: org.apache.tomcat.util.net.AbstractEndpoint$PrivilegedSetTccl at java.net.URLClassLoader$1.run(URLClassLoader.java:366) at java.net.URLClassLoader$1.run(URLClassLoader.java:355) at java.security.AccessController.doPrivileged(Native Method) at java.net.URLClassLoader.findClass(URLClassLoader.java:354) at java.lang.ClassLoader.loadClass(ClassLoader.java:425) at java.lang.ClassLoader.loadClass(ClassLoader.java:358) at org.apache.catalina.security.SecurityClassLoad.loadTomcatPackage(SecurityClassLoad.java:283) at org.apache.catalina.security.SecurityClassLoad.securityClassLoad(SecurityClassLoad.java:49) at org.apache.catalina.startup.Bootstrap.init(Bootstrap.java:261) at org.apache.catalina.startup.Bootstrap.main(Bootstrap.java:456) Steps to reproduce: 1.) Download and unzip. 2.) ./bin/startup.sh -security 3.) cat logs/catalina.out I know what that is. The fix is easy. RC9 coming up. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1551550 - /tomcat/trunk/java/org/apache/tomcat/websocket/pojo/LocalStrings.properties
Author: remm
Date: Tue Dec 17 14:31:44 2013
New Revision: 1551550
URL: http://svn.apache.org/r1551550
Log:
Fix typo.
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/LocalStrings.properties
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/LocalStrings.properties?rev=1551550r1=1551549r2=1551550view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/pojo/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/pojo/LocalStrings.properties
Tue Dec 17 14:31:44 2013
@@ -37,4 +37,4 @@ pojoMethodMapping.partialPong=Invalid Po
pojoMethodMapping.partialReader=Invalid Reader and boolean parameters present
on the method [{0}] of class [{1}] that was annotated with OnMessage
pojoMethodMapping.pongWithPayload=Invalid PongMessgae and Message parameters
present on the method [{0}] of class [{1}] that was annotated with OnMessage
pojoMessageHandlerWhole.decodeIoFail=IO error while decoding message
-pojoMessageHandlerWhole.maxBufferSize=The maximum supported message size for
this implementation in Integer.MAX_VALUE
+pojoMessageHandlerWhole.maxBufferSize=The maximum supported message size for
this implementation is Integer.MAX_VALUE
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a new failure on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/1645 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1551546 Blamelist: rjung BUILD FAILED: failed compile_1 sincerely, -The Buildbot
svn commit: r1551580 - /tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/pojo/LocalStrings.properties
Author: remm
Date: Tue Dec 17 15:37:48 2013
New Revision: 1551580
URL: http://svn.apache.org/r1551580
Log:
Fix typo.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/pojo/LocalStrings.properties
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/pojo/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/pojo/LocalStrings.properties?rev=1551580r1=1551579r2=1551580view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/pojo/LocalStrings.properties
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/pojo/LocalStrings.properties
Tue Dec 17 15:37:48 2013
@@ -37,4 +37,4 @@ pojoMethodMapping.partialPong=Invalid Po
pojoMethodMapping.partialReader=Invalid Reader and boolean parameters present
on the method [{0}] of class [{1}] that was annotated with OnMessage
pojoMethodMapping.pongWithPayload=Invalid PongMessgae and Message parameters
present on the method [{0}] of class [{1}] that was annotated with OnMessage
pojoMessageHandlerWhole.decodeIoFail=IO error while decoding message
-pojoMessageHandlerWhole.maxBufferSize=The maximum supported message size for
this implementation in Integer.MAX_VALUE
+pojoMessageHandlerWhole.maxBufferSize=The maximum supported message size for
this implementation is Integer.MAX_VALUE
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a restored build on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/1646 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1551580 Blamelist: remm Build succeeded! sincerely, -The Buildbot
buildbot success in ASF Buildbot on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/5343 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1551550 Blamelist: remm Build succeeded! sincerely, -The Buildbot
svn commit: r1551684 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Tue Dec 17 20:24:01 2013 New Revision: 1551684 URL: http://svn.apache.org/r1551684 Log: Vote Update proposal to take account of comments 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=1551684r1=1551683r2=1551684view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Dec 17 20:24:01 2013 @@ -46,7 +46,7 @@ PATCHES PROPOSED TO BACKPORT: to change service start wait time from default of 10 seconds. http://svn.apache.org/r1503852 http://svn.apache.org/r1505844 - +1: schultz, kkolinko + +1: schultz, kkolinko, markt -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55266 @@ -58,9 +58,9 @@ PATCHES PROPOSED TO BACKPORT: * Fix issue with Manager app and other apps that use i18n in the UI when a request that specifies an Accept-Language of English ahead of French, Spanish or Japanese. - http://svn.apache.org/r1514376 - +1: schultz, markt - +0: kkolinko: 1) Code in Tomcat 6 differs. A patch is needed. 2) +r1521693 + Port all the other improvements to the StringManager from trunk as well + http://people.apache.org/~markt/patches/2013-12-17-webapp-locale-tc6.patch + +1: markt -1: * Better adherence to RFC2616 for content-length headers. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Current sporadic test suite failures
On 17.12.2013 11:01, Rainer Jung wrote: A) TC 7 === 1) org.apache.catalina.loader.TestWebappClassLoaderMemoryLeak - 1 x apr, 3 x bio, 4 x nio Fixed by syncing the test impl with trunk which uses a wait loop. No more failures observed. 2) org.apache.catalina.websocket.TestWebSocket -- 2 x bio, 1 x nio I think I know what the problem is and I'm just now running an ugly fix in a loop. Looks good. Problem: the web socket client in the test class reads from the socket input stream first using a buffered reader (for the headers, encoding ISO-8859-1) and then later using the raw input stream (for the body, decoding using a B2CConverter to UTF-8). Sometimes the body can not be found in the raw stream, because it already was slurped in by the buffered reader. Unfortunately simply using an InputStreamReader instead of a BufferedReader doesn't fix the problem, because the InputStreamReader still seems to buffer a few bytes sometimes. So I'm now doing I/O only on the InputStream, converting to ISO-8859-1 resp. UTF-8 using B2CConverter. It seems to work, but is a bit more code and also a bit ugly. I found no clean way of switching the decoding charset with JDK APIs though. So if I'm right those test failures were false positives. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1551658 - /tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
Author: markt
Date: Tue Dec 17 19:10:07 2013
New Revision: 1551658
URL: http://svn.apache.org/r1551658
Log:
Fix indentation
Modified:
tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
Modified: tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java?rev=1551658r1=1551657r2=1551658view=diff
==
--- tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java Tue
Dec 17 19:10:07 2013
@@ -56,7 +56,7 @@ public final class SecurityClassLoad {
private static final void loadCorePackage(ClassLoader loader)
-throws Exception {
+throws Exception {
final String basePackage = org.apache.catalina.core.;
loader.loadClass
(basePackage +
@@ -113,7 +113,7 @@ public final class SecurityClassLoad {
private static final void loadLoaderPackage(ClassLoader loader)
-throws Exception {
+throws Exception {
final String basePackage = org.apache.catalina.loader.;
loader.loadClass
(basePackage +
@@ -130,7 +130,7 @@ public final class SecurityClassLoad {
private static final void loadSessionPackage(ClassLoader loader)
-throws Exception {
+throws Exception {
final String basePackage = org.apache.catalina.session.;
loader.loadClass
(basePackage + StandardSession);
@@ -144,7 +144,7 @@ public final class SecurityClassLoad {
private static final void loadUtilPackage(ClassLoader loader)
-throws Exception {
+throws Exception {
final String basePackage = org.apache.catalina.util.;
loader.loadClass(basePackage + ParameterMap);
}
@@ -152,9 +152,9 @@ public final class SecurityClassLoad {
private static final void loadValvesPackage(ClassLoader loader)
throws Exception {
-final String basePackage = org.apache.catalina.valves.;
-loader.loadClass(basePackage + AccessLogValve$3);
-}
+final String basePackage = org.apache.catalina.valves.;
+loader.loadClass(basePackage + AccessLogValve$3);
+}
private static final void loadCoyotePackage(ClassLoader loader)
@@ -169,13 +169,13 @@ public final class SecurityClassLoad {
private static final void loadJavaxPackage(ClassLoader loader)
-throws Exception {
+throws Exception {
loader.loadClass(javax.servlet.http.Cookie);
}
private static final void loadConnectorPackage(ClassLoader loader)
-throws Exception {
+throws Exception {
final String basePackage = org.apache.catalina.connector.;
loader.loadClass
(basePackage +
@@ -258,7 +258,7 @@ public final class SecurityClassLoad {
}
private static final void loadTomcatPackage(ClassLoader loader)
-throws Exception {
+throws Exception {
final String basePackage = org.apache.tomcat.;
// buf
loader.loadClass(basePackage + util.buf.HexUtils);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1551652 - /tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
Author: markt
Date: Tue Dec 17 18:47:49 2013
New Revision: 1551652
URL: http://svn.apache.org/r1551652
Log:
Refactor to enable some basic unit testing
Modified:
tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
Modified: tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java?rev=1551652r1=1551651r2=1551652view=diff
==
--- tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java Tue
Dec 17 18:47:49 2013
@@ -30,10 +30,15 @@ package org.apache.catalina.security;
public final class SecurityClassLoad {
-public static void securityClassLoad(ClassLoader loader)
-throws Exception {
+public static void securityClassLoad(ClassLoader loader) throws Exception {
+securityClassLoad(loader, true);
+}
+
+
+static void securityClassLoad(ClassLoader loader, boolean
requireSecurityManager)
+throws Exception {
-if( System.getSecurityManager() == null ){
+if (requireSecurityManager System.getSecurityManager() == null) {
return;
}
@@ -280,8 +285,9 @@ public final class SecurityClassLoad {
loader.loadClass(basePackage +
util.net.NioBlockingSelector$BlockPoller$3);
loader.loadClass(basePackage + util.net.SSLSupport$CipherData);
+// threads
loader.loadClass
-(basePackage + util.net.AbstractEndpoint$PrivilegedSetTccl);
+(basePackage + util.threads.TaskThreadFactory$PrivilegedSetTccl);
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1551653 - in /tomcat/trunk/test/org/apache/catalina/security: ./ TestSecurityClassLoad.java
Author: markt
Date: Tue Dec 17 18:49:14 2013
New Revision: 1551653
URL: http://svn.apache.org/r1551653
Log:
Add a basic unit test
Added:
tomcat/trunk/test/org/apache/catalina/security/
tomcat/trunk/test/org/apache/catalina/security/TestSecurityClassLoad.java
(with props)
Added: tomcat/trunk/test/org/apache/catalina/security/TestSecurityClassLoad.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/security/TestSecurityClassLoad.java?rev=1551653view=auto
==
--- tomcat/trunk/test/org/apache/catalina/security/TestSecurityClassLoad.java
(added)
+++ tomcat/trunk/test/org/apache/catalina/security/TestSecurityClassLoad.java
Tue Dec 17 18:49:14 2013
@@ -0,0 +1,32 @@
+/*
+ * 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.
+ */
+package org.apache.catalina.security;
+
+import org.junit.Test;
+
+public class TestSecurityClassLoad {
+
+@Test
+public void testLoad() throws Exception {
+// Note that this will fail if you run it from within Eclipse. This is
+// because one of the loaded classes (AccessLogValve$3) is a synthetic
+// class generated by javac but not by the JDT compiler. Behaviour with
+// other IDEs is currently unknown.
+SecurityClassLoad.securityClassLoad(
+Thread.currentThread().getContextClassLoader(), false);
+}
+}
Propchange:
tomcat/trunk/test/org/apache/catalina/security/TestSecurityClassLoad.java
--
svn:eol-style = native
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn propchange: r1551652 - svn:log
Author: markt Revision: 1551652 Modified property: svn:log Modified: svn:log at Tue Dec 17 18:50:13 2013 -- --- svn:log (original) +++ svn:log Tue Dec 17 18:50:13 2013 @@ -1 +1,2 @@ -Refactor to enable some basic unit testing +Fix a reported issue when running under a security manager. +Refactor to enable some basic unit testing to hopefully avoid some of these issues in future. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1551729 - /tomcat/tc7.0.x/trunk/test/org/apache/catalina/websocket/TestWebSocket.java
Author: rjung
Date: Tue Dec 17 21:43:02 2013
New Revision: 1551729
URL: http://svn.apache.org/r1551729
Log:
Fix occasional test failure.
The WebSocketClient first read headers via
a BufferedReader, then tried to read the body
via the underlying InputStream. Depending on
the structure of the incoming packets reading
the body failed because some bytes were already
buffered in the reader and no longer available
by the stream. The switch between rader and stream
was motivated, because the decoding also had to
switch from ISO-8859-1 (headers) to UTF-8 (body).
We now simulate a rudimentary reader which always
reads from the stream and allows to change the
decoding charset while reading.
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/websocket/TestWebSocket.java
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/websocket/TestWebSocket.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/websocket/TestWebSocket.java?rev=1551729r1=1551728r2=1551729view=diff
==
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/websocket/TestWebSocket.java
(original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/websocket/TestWebSocket.java
Tue Dec 17 21:43:02 2013
@@ -16,13 +16,11 @@
*/
package org.apache.catalina.websocket;
-import java.io.BufferedReader;
+import java.io.BufferedInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
-import java.io.Reader;
import java.io.Writer;
import java.net.InetSocketAddress;
import java.net.Socket;
@@ -382,12 +380,11 @@ public class TestWebSocket extends Tomca
private static class WebSocketClient {
private OutputStream os;
-private InputStream is;
private boolean isContinuation = false;
final String encoding = ISO-8859-1;
-private Socket socket ;
-private Writer writer ;
-private BufferedReader reader;
+private Socket socket;
+private Writer writer;
+private CustomReader reader;
public WebSocketClient(int port) {
SocketAddress addr = new InetSocketAddress(localhost, port);
@@ -397,9 +394,7 @@ public class TestWebSocket extends Tomca
socket.connect(addr, 1);
os = socket.getOutputStream();
writer = new OutputStreamWriter(os, encoding);
-is = socket.getInputStream();
-Reader r = new InputStreamReader(is, encoding);
-reader = new BufferedReader(r);
+reader = new CustomReader(socket.getInputStream(), encoding);
} catch (Exception e) {
throw new RuntimeException(e);
}
@@ -449,28 +444,100 @@ public class TestWebSocket extends Tomca
}
private String readMessage() throws IOException {
-ByteChunk bc = new ByteChunk(125);
-CharChunk cc = new CharChunk(125);
// Skip first byte
-is.read();
+reader.read();
// Get payload length
-int len = is.read() 0x7F;
+int len = reader.read() 0x7F;
assertTrue(len 126);
// Read payload
-int read = 0;
-while (read len) {
-read = read + is.read(bc.getBytes(), read, len - read);
+reader.setEncoding(UTF-8);
+return reader.read(len);
+}
+/*
+ * This is not a real reader but just a thin wrapper around
+ * an input stream that allows to switch encoding during
+ * reading.
+ * An example is reading headers using ISO-8859-1 and a body
+ * using UTF-8.
+ * The class is not thread-safe and not well-performing.
+ */
+private class CustomReader {
+private InputStream is;
+private String encoding;
+private boolean markSupported;
+private B2CConverter b2c;
+
+public CustomReader(InputStream is, String encoding) throws
IOException {
+this.is = new BufferedInputStream(is);
+this.encoding = encoding;
+markSupported = is.markSupported();
+b2c = new B2CConverter(encoding);
+}
+
+public String getEncoding() {
+return encoding;
+}
+
+public void setEncoding(String encoding) throws IOException {
+this.encoding = encoding;
+b2c = new B2CConverter(encoding);
}
-bc.setEnd(len);
+public int read() throws IOException {
+return is.read();
+}
-B2CConverter b2c = new B2CConverter(UTF-8);
-b2c.convert(bc, cc, true);
+public String read(int len) throws
svn commit: r1551731 - /tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapper.java
Author: markt
Date: Tue Dec 17 21:47:28 2013
New Revision: 1551731
URL: http://svn.apache.org/r1551731
Log:
Observed a hard to reproduce test failure with the non-blocking IO tests. Can't
reproduce it yet. Working assumption is that Poller and application thread have
a different view of the async field on the SocketWrapper so make all the flags
the Poller uses volatile.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapper.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapper.java?rev=1551731r1=1551730r2=1551731view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapper.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapper.java Tue Dec 17
21:47:28 2013
@@ -31,10 +31,10 @@ public class SocketWrapperE {
private long timeout = -1;
private boolean error = false;
private volatile int keepAliveLeft = 100;
-private boolean comet = false;
-private boolean async = false;
+private volatile boolean comet = false;
+private volatile boolean async = false;
private boolean keptAlive = false;
-private boolean upgraded = false;
+private volatile boolean upgraded = false;
private boolean secure = false;
/*
* Following cached for speed / reduced GC
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1551729 - /tomcat/tc7.0.x/trunk/test/org/apache/catalina/websocket/TestWebSocket.java
On 17 December 2013 21:43, rj...@apache.org wrote:
Author: rjung
Date: Tue Dec 17 21:43:02 2013
New Revision: 1551729
URL: http://svn.apache.org/r1551729
Log:
Fix occasional test failure.
The WebSocketClient first read headers via
a BufferedReader, then tried to read the body
via the underlying InputStream. Depending on
the structure of the incoming packets reading
the body failed because some bytes were already
buffered in the reader and no longer available
by the stream. The switch between rader and stream
was motivated, because the decoding also had to
switch from ISO-8859-1 (headers) to UTF-8 (body).
We now simulate a rudimentary reader which always
reads from the stream and allows to change the
decoding charset while reading.
It would be helpful to include this log message in the code comments.
The commit log is basically ephemeral - it should (only) document why
the commit was made.
In this case Fix occasional test failure. would be sufficient.
Comments that may be needed to understand why the code behaves in a
particular way belong as comments in the code.
After all, the mission of the ASF is to release source, which should
be able to stand on its own.
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/websocket/TestWebSocket.java
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/websocket/TestWebSocket.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/websocket/TestWebSocket.java?rev=1551729r1=1551728r2=1551729view=diff
==
---
tomcat/tc7.0.x/trunk/test/org/apache/catalina/websocket/TestWebSocket.java
(original)
+++
tomcat/tc7.0.x/trunk/test/org/apache/catalina/websocket/TestWebSocket.java
Tue Dec 17 21:43:02 2013
@@ -16,13 +16,11 @@
*/
package org.apache.catalina.websocket;
-import java.io.BufferedReader;
+import java.io.BufferedInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
-import java.io.Reader;
import java.io.Writer;
import java.net.InetSocketAddress;
import java.net.Socket;
@@ -382,12 +380,11 @@ public class TestWebSocket extends Tomca
private static class WebSocketClient {
private OutputStream os;
-private InputStream is;
private boolean isContinuation = false;
final String encoding = ISO-8859-1;
-private Socket socket ;
-private Writer writer ;
-private BufferedReader reader;
+private Socket socket;
+private Writer writer;
+private CustomReader reader;
public WebSocketClient(int port) {
SocketAddress addr = new InetSocketAddress(localhost, port);
@@ -397,9 +394,7 @@ public class TestWebSocket extends Tomca
socket.connect(addr, 1);
os = socket.getOutputStream();
writer = new OutputStreamWriter(os, encoding);
-is = socket.getInputStream();
-Reader r = new InputStreamReader(is, encoding);
-reader = new BufferedReader(r);
+reader = new CustomReader(socket.getInputStream(), encoding);
} catch (Exception e) {
throw new RuntimeException(e);
}
@@ -449,28 +444,100 @@ public class TestWebSocket extends Tomca
}
private String readMessage() throws IOException {
-ByteChunk bc = new ByteChunk(125);
-CharChunk cc = new CharChunk(125);
// Skip first byte
-is.read();
+reader.read();
// Get payload length
-int len = is.read() 0x7F;
+int len = reader.read() 0x7F;
assertTrue(len 126);
// Read payload
-int read = 0;
-while (read len) {
-read = read + is.read(bc.getBytes(), read, len - read);
+reader.setEncoding(UTF-8);
+return reader.read(len);
+}
+/*
+ * This is not a real reader but just a thin wrapper around
+ * an input stream that allows to switch encoding during
+ * reading.
+ * An example is reading headers using ISO-8859-1 and a body
+ * using UTF-8.
+ * The class is not thread-safe and not well-performing.
+ */
+private class CustomReader {
+private InputStream is;
+private String encoding;
+private boolean markSupported;
+private B2CConverter b2c;
+
+public CustomReader(InputStream is, String encoding) throws
IOException {
+this.is = new BufferedInputStream(is);
+this.encoding = encoding;
+markSupported = is.markSupported();
+b2c = new
svn commit: r1551734 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Tue Dec 17 22:10:42 2013 New Revision: 1551734 URL: http://svn.apache.org/r1551734 Log: Update proposal with additional patches from trunk 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=1551734r1=1551733r2=1551734view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Dec 17 22:10:42 2013 @@ -81,8 +81,8 @@ PATCHES PROPOSED TO BACKPORT: * Add support for limiting the size of chunk extensions when using chunked encoding. - http://people.apache.org/~markt/patches/2013-09-11-tc6-chunk-extensions.patch - +1: markt, kkolinko + http://people.apache.org/~markt/patches/2013-12-17-chunk-extensions-tc6-v2.patch + +1: markt -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55749 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1551767 - in /tomcat/tags/TOMCAT_8_0_0_RC9: ./ build.properties.default res/maven/mvn.properties.default
Author: markt Date: Tue Dec 17 23:48:46 2013 New Revision: 1551767 URL: http://svn.apache.org/r1551767 Log: Tag 8.0.0-RC9 Added: tomcat/tags/TOMCAT_8_0_0_RC9/ - copied from r1551766, tomcat/trunk/ Modified: tomcat/tags/TOMCAT_8_0_0_RC9/build.properties.default tomcat/tags/TOMCAT_8_0_0_RC9/res/maven/mvn.properties.default Modified: tomcat/tags/TOMCAT_8_0_0_RC9/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/tags/TOMCAT_8_0_0_RC9/build.properties.default?rev=1551767r1=1551766r2=1551767view=diff == --- tomcat/tags/TOMCAT_8_0_0_RC9/build.properties.default (original) +++ tomcat/tags/TOMCAT_8_0_0_RC9/build.properties.default Tue Dec 17 23:48:46 2013 @@ -29,7 +29,7 @@ version.major=8 version.minor=0 version.build=0 version.patch=0 -version.suffix=-dev +version.suffix=-RC9 # - Build control flags - # Note enabling validation uses Checkstyle which is LGPL licensed Modified: tomcat/tags/TOMCAT_8_0_0_RC9/res/maven/mvn.properties.default URL: http://svn.apache.org/viewvc/tomcat/tags/TOMCAT_8_0_0_RC9/res/maven/mvn.properties.default?rev=1551767r1=1551766r2=1551767view=diff == --- tomcat/tags/TOMCAT_8_0_0_RC9/res/maven/mvn.properties.default (original) +++ tomcat/tags/TOMCAT_8_0_0_RC9/res/maven/mvn.properties.default Tue Dec 17 23:48:46 2013 @@ -35,7 +35,7 @@ maven.asf.release.repo.url=https://repos maven.asf.release.repo.repositoryId=apache.releases # Release version info -maven.asf.release.deploy.version=8.0.0 +maven.asf.release.deploy.version=8.0.0-RC9 #Where do we load the libraries from tomcat.lib.path=../../output/build/lib - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[VOTE][CANCELLED] Release Apache Tomcat 8.0.0-RC8
Vote cancelled due to the issue when running under a security manager. RC9 on the way. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Code signing trial - volunteers wanted
The infrastructure team is about to start a trial of a code signing service provided by Symantec. Tomcat is going to be the guinea pig for this trial. As part of the trial we want to test the mapping of the roles in the service to the roles at the ASF. We are therefore looking for two volunteers. Both volunteers need to be Tomcat committers. At least one of the volunteers needs to be a PMC member. My outline plan at the moment is something like: - Set up the test signing service - Figure out how to sign our Windows installer - Script the process - Get volunteer one (who will have RM permissions) to do a test release - Get volunteer two (who will have PMC permissions) to approve the test release for signing The idea is that any committer can be a release manager and upload a release for signing but only a PMC member can approve the upload for signing. Figuring out if that process is workable is part of the trial. Thanks in advance, Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r3930 [2/2] - in /dev/tomcat/tomcat-8: v8.0.0-RC8/ v8.0.0-RC9/ v8.0.0-RC9/bin/ v8.0.0-RC9/bin/embed/ v8.0.0-RC9/bin/extras/ v8.0.0-RC9/src/
Added: dev/tomcat/tomcat-8/v8.0.0-RC9/src/apache-tomcat-8.0.0-RC9-src.tar.gz.asc == --- dev/tomcat/tomcat-8/v8.0.0-RC9/src/apache-tomcat-8.0.0-RC9-src.tar.gz.asc (added) +++ dev/tomcat/tomcat-8/v8.0.0-RC9/src/apache-tomcat-8.0.0-RC9-src.tar.gz.asc Wed Dec 18 00:55:04 2013 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1.4.9 (MingW32) + +iQIcBAABAgAGBQJSsOQwAAoJEBDAHFovYFnn4WEQAOv5DVNky17Qy8o6ugaDjvMq +pfQYW+eJ2jD7+k7fKagZIi31YLx8lSUPBrPaziNO+7JJUXWSiRQL3qxGpZoO7KhQ +5O10Y/Ypt8iyW7I8Fv8AuscWm/ghWSNFljHh3ajN24OFAtq97CnbrmoVPnDgl//X +LtyLq9rhLnE7wl4LaA2h26XDkZ2KW1z5PGPE/BYjJ8gH5/9sq40dikjq/bVCutrx +yxGaf2JbrqOoaDg2b01hHHnPMsh3qZfbJYO+A8szYjdsEt4BKARjN+VMqjyDJbRi +Ndv+OAmxHQ+MHg3PjrP+693u6FPsrhXMK6BgWgF7D5/1uQUJKnY8D43H+iT0uuFB +ufF1C21w8w2BK6P7S80BP8fZdObsDwbmgECoBJZVqAfUkob2URNBidfmie5X2ANY +PjSUZwdemZBaNB+4mSd2QEEL4cM9IIqQHliHw9s5ZDZEYCFVMC8k+UKjweRL5qma +sPYMICiObgXKRv9I07Ma2hxWevGsh4qyCyeh8STgg6mhjfcPynXlwuXXs4s9J6rB +/b2p2msZp+B53Y+zd0oYk2/Y9ZlcerTj/ypTbf8Mqsutj8oFnLU5nB4fwCbA6O5K +ZHltoblYV+/vFhk8NoYWmbFp6McpCPXoF+R4429nApRYak83x6lYFqr9RKq/uMUb +cBGk5QP+chJ539BZMh1L +=ctO7 +-END PGP SIGNATURE- Added: dev/tomcat/tomcat-8/v8.0.0-RC9/src/apache-tomcat-8.0.0-RC9-src.tar.gz.md5 == --- dev/tomcat/tomcat-8/v8.0.0-RC9/src/apache-tomcat-8.0.0-RC9-src.tar.gz.md5 (added) +++ dev/tomcat/tomcat-8/v8.0.0-RC9/src/apache-tomcat-8.0.0-RC9-src.tar.gz.md5 Wed Dec 18 00:55:04 2013 @@ -0,0 +1 @@ +39ac0ac4622670b7dca363c155672076 *apache-tomcat-8.0.0-RC9-src.tar.gz \ No newline at end of file Added: dev/tomcat/tomcat-8/v8.0.0-RC9/src/apache-tomcat-8.0.0-RC9-src.zip == Binary file - no diff available. Propchange: dev/tomcat/tomcat-8/v8.0.0-RC9/src/apache-tomcat-8.0.0-RC9-src.zip -- svn:mime-type = application/octet-stream Added: dev/tomcat/tomcat-8/v8.0.0-RC9/src/apache-tomcat-8.0.0-RC9-src.zip.asc == --- dev/tomcat/tomcat-8/v8.0.0-RC9/src/apache-tomcat-8.0.0-RC9-src.zip.asc (added) +++ dev/tomcat/tomcat-8/v8.0.0-RC9/src/apache-tomcat-8.0.0-RC9-src.zip.asc Wed Dec 18 00:55:04 2013 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1.4.9 (MingW32) + +iQIcBAABAgAGBQJSsOQaAAoJEBDAHFovYFnnr68QALnbjnR2G/CfC1AScPhAMBB8 +Dklnmd+9DUGrjIX0sx/IebzMLGZT7qBNe9pTO/SIJ9/RuwFOTbvThrGA8UV6d9uO +1UXWEisboK3ExzyOw5stDHFLusmPpbrW4nTvQQieglhEIdff1UYqmtRhWqSTPFg7 +GKUhL/m65px97lAjDQ7N2Akcu8WgA5bzq5I4oF9PYnmeZnkF4s0w5RKMCo5PzQvm +vk3E9VVDK5rw7unBntU9UJl4/agdJ0h4s6Z14l9hIjPJPMvaN3eAxY5FYNwiycEm +AxfJvleoan7Uu3lgHBZrb7JBrm1If29cJi+eQEFOkXEdZGKPAipucUjw3f6cKgCq +GSD0JP9a046cYMuJJhVtHXKqf4XtkPCiLVWh8o2WWNmZCgHfITIkvuCch6WVgyoG +wme5TXB3qBORVOU8Klc4T8RQqnrRgL43uw5UkDuKG8ss7lpcmgxkzCPjldP/tJ4L +D4Wzj6+WYyX1tO32QVjYSR7Zls/9EzvakR1yohz+rs354JaUfBCT/wAFxGeZFZkX +bqb6ICZXoEFfevwZWbpBVEH7m9MUsmW3vgC2fXb5efW1gpgSdIm7iBWm93VbyfEu +DoDDPISCyHlq/rdlJL7vPxwQ+dbpen3OzO73wqfIb6GJPTBqLNKv9eBY5LtTXtJu +109DWVTdUGjSga6iqSiY +=lhhJ +-END PGP SIGNATURE- Added: dev/tomcat/tomcat-8/v8.0.0-RC9/src/apache-tomcat-8.0.0-RC9-src.zip.md5 == --- dev/tomcat/tomcat-8/v8.0.0-RC9/src/apache-tomcat-8.0.0-RC9-src.zip.md5 (added) +++ dev/tomcat/tomcat-8/v8.0.0-RC9/src/apache-tomcat-8.0.0-RC9-src.zip.md5 Wed Dec 18 00:55:04 2013 @@ -0,0 +1 @@ +84e59d0663b9e1c5e5327da2ed8dae8e *apache-tomcat-8.0.0-RC9-src.zip \ No newline at end of file - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r3930 [2/2] - in /dev/tomcat/tomcat-8: v8.0.0-RC8/ v8.0.0-RC9/ v8.0.0-RC9/bin/ v8.0.0-RC9/bin/embed/ v8.0.0-RC9/bin/extras/ v8.0.0-RC9/src/
Added: dev/tomcat/tomcat-8/v8.0.0-RC9/src/apache-tomcat-8.0.0-RC9-src.tar.gz.asc == --- dev/tomcat/tomcat-8/v8.0.0-RC9/src/apache-tomcat-8.0.0-RC9-src.tar.gz.asc (added) +++ dev/tomcat/tomcat-8/v8.0.0-RC9/src/apache-tomcat-8.0.0-RC9-src.tar.gz.asc Wed Dec 18 00:55:04 2013 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1.4.9 (MingW32) + +iQIcBAABAgAGBQJSsOQwAAoJEBDAHFovYFnn4WEQAOv5DVNky17Qy8o6ugaDjvMq +pfQYW+eJ2jD7+k7fKagZIi31YLx8lSUPBrPaziNO+7JJUXWSiRQL3qxGpZoO7KhQ +5O10Y/Ypt8iyW7I8Fv8AuscWm/ghWSNFljHh3ajN24OFAtq97CnbrmoVPnDgl//X +LtyLq9rhLnE7wl4LaA2h26XDkZ2KW1z5PGPE/BYjJ8gH5/9sq40dikjq/bVCutrx +yxGaf2JbrqOoaDg2b01hHHnPMsh3qZfbJYO+A8szYjdsEt4BKARjN+VMqjyDJbRi +Ndv+OAmxHQ+MHg3PjrP+693u6FPsrhXMK6BgWgF7D5/1uQUJKnY8D43H+iT0uuFB +ufF1C21w8w2BK6P7S80BP8fZdObsDwbmgECoBJZVqAfUkob2URNBidfmie5X2ANY +PjSUZwdemZBaNB+4mSd2QEEL4cM9IIqQHliHw9s5ZDZEYCFVMC8k+UKjweRL5qma +sPYMICiObgXKRv9I07Ma2hxWevGsh4qyCyeh8STgg6mhjfcPynXlwuXXs4s9J6rB +/b2p2msZp+B53Y+zd0oYk2/Y9ZlcerTj/ypTbf8Mqsutj8oFnLU5nB4fwCbA6O5K +ZHltoblYV+/vFhk8NoYWmbFp6McpCPXoF+R4429nApRYak83x6lYFqr9RKq/uMUb +cBGk5QP+chJ539BZMh1L +=ctO7 +-END PGP SIGNATURE- Added: dev/tomcat/tomcat-8/v8.0.0-RC9/src/apache-tomcat-8.0.0-RC9-src.tar.gz.md5 == --- dev/tomcat/tomcat-8/v8.0.0-RC9/src/apache-tomcat-8.0.0-RC9-src.tar.gz.md5 (added) +++ dev/tomcat/tomcat-8/v8.0.0-RC9/src/apache-tomcat-8.0.0-RC9-src.tar.gz.md5 Wed Dec 18 00:55:04 2013 @@ -0,0 +1 @@ +39ac0ac4622670b7dca363c155672076 *apache-tomcat-8.0.0-RC9-src.tar.gz \ No newline at end of file Added: dev/tomcat/tomcat-8/v8.0.0-RC9/src/apache-tomcat-8.0.0-RC9-src.zip == Binary file - no diff available. Propchange: dev/tomcat/tomcat-8/v8.0.0-RC9/src/apache-tomcat-8.0.0-RC9-src.zip -- svn:mime-type = application/octet-stream Added: dev/tomcat/tomcat-8/v8.0.0-RC9/src/apache-tomcat-8.0.0-RC9-src.zip.asc == --- dev/tomcat/tomcat-8/v8.0.0-RC9/src/apache-tomcat-8.0.0-RC9-src.zip.asc (added) +++ dev/tomcat/tomcat-8/v8.0.0-RC9/src/apache-tomcat-8.0.0-RC9-src.zip.asc Wed Dec 18 00:55:04 2013 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1.4.9 (MingW32) + +iQIcBAABAgAGBQJSsOQaAAoJEBDAHFovYFnnr68QALnbjnR2G/CfC1AScPhAMBB8 +Dklnmd+9DUGrjIX0sx/IebzMLGZT7qBNe9pTO/SIJ9/RuwFOTbvThrGA8UV6d9uO +1UXWEisboK3ExzyOw5stDHFLusmPpbrW4nTvQQieglhEIdff1UYqmtRhWqSTPFg7 +GKUhL/m65px97lAjDQ7N2Akcu8WgA5bzq5I4oF9PYnmeZnkF4s0w5RKMCo5PzQvm +vk3E9VVDK5rw7unBntU9UJl4/agdJ0h4s6Z14l9hIjPJPMvaN3eAxY5FYNwiycEm +AxfJvleoan7Uu3lgHBZrb7JBrm1If29cJi+eQEFOkXEdZGKPAipucUjw3f6cKgCq +GSD0JP9a046cYMuJJhVtHXKqf4XtkPCiLVWh8o2WWNmZCgHfITIkvuCch6WVgyoG +wme5TXB3qBORVOU8Klc4T8RQqnrRgL43uw5UkDuKG8ss7lpcmgxkzCPjldP/tJ4L +D4Wzj6+WYyX1tO32QVjYSR7Zls/9EzvakR1yohz+rs354JaUfBCT/wAFxGeZFZkX +bqb6ICZXoEFfevwZWbpBVEH7m9MUsmW3vgC2fXb5efW1gpgSdIm7iBWm93VbyfEu +DoDDPISCyHlq/rdlJL7vPxwQ+dbpen3OzO73wqfIb6GJPTBqLNKv9eBY5LtTXtJu +109DWVTdUGjSga6iqSiY +=lhhJ +-END PGP SIGNATURE- Added: dev/tomcat/tomcat-8/v8.0.0-RC9/src/apache-tomcat-8.0.0-RC9-src.zip.md5 == --- dev/tomcat/tomcat-8/v8.0.0-RC9/src/apache-tomcat-8.0.0-RC9-src.zip.md5 (added) +++ dev/tomcat/tomcat-8/v8.0.0-RC9/src/apache-tomcat-8.0.0-RC9-src.zip.md5 Wed Dec 18 00:55:04 2013 @@ -0,0 +1 @@ +84e59d0663b9e1c5e5327da2ed8dae8e *apache-tomcat-8.0.0-RC9-src.zip \ No newline at end of file - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[VOTE] Release Apache Tomcat 8.0.0-RC9
The proposed Apache Tomcat 8.0.0 release candidate 9 is now available for voting. Given this is a release candidate I am working on the basis that it is equivalent to an alpha. The main changes since RC5 are: - Better handling of generic types in the WebSocket 1.0 implementation - Refactor resource handling for the class loader - Add Cobertura support to the unit tests - Remove anti-Jar locking feature and replace it with open stream tracking - Update to a post Commons Pool 2.0 release snapshot - Complete refactoring of TLD handling including caching of parsed TLDs - More consistent handling of XML validation options - Much more detailed visibility of DBCP connections pools in JMX - Better organisation of JMX beans in the default JConsole view - Performance improvements - Numerous bug fixes It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.0.0-RC9/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-063/ The svn tag is: http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_8_0_0_RC9/ The proposed 8.0.0-RC9 release is: [ ] Broken - do not release [ ] Alpha - go ahead and release as 8.0.0-RC9 alpha Cheers, Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1551814 - in /tomcat/trunk/webapps/examples/WEB-INF/classes: CookieExample.java HelloWorldExample.java RequestHeaderExample.java RequestInfoExample.java RequestParamExample.java SessionEx
Author: kpreisser
Date: Wed Dec 18 02:53:35 2013
New Revision: 1551814
URL: http://svn.apache.org/r1551814
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48550
Follow-Up to r1511468:
Fix example servlets to output text as UTF-8. This fixes encoding issues with
the Request Parameters and Cookies as otherwise the browser would encode
the form data with the document encoding (ISO-8859-1) but Tomcat will interpret
it as UTF-8.
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/CookieExample.java
tomcat/trunk/webapps/examples/WEB-INF/classes/HelloWorldExample.java
tomcat/trunk/webapps/examples/WEB-INF/classes/RequestHeaderExample.java
tomcat/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java
tomcat/trunk/webapps/examples/WEB-INF/classes/RequestParamExample.java
tomcat/trunk/webapps/examples/WEB-INF/classes/SessionExample.java
Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/CookieExample.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/CookieExample.java?rev=1551814r1=1551813r2=1551814view=diff
==
--- tomcat/trunk/webapps/examples/WEB-INF/classes/CookieExample.java (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/CookieExample.java Wed Dec 18
02:53:35 2013
@@ -57,10 +57,12 @@ public class CookieExample extends HttpS
}
response.setContentType(text/html);
+response.setCharacterEncoding(UTF-8);
PrintWriter out = response.getWriter();
-out.println(html);
+out.println(!DOCTYPE htmlhtml);
out.println(head);
+out.println(meta charset=\UTF-8\ /);
String title = RB.getString(cookies.title);
out.println(title + title + /title);
Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/HelloWorldExample.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/HelloWorldExample.java?rev=1551814r1=1551813r2=1551814view=diff
==
--- tomcat/trunk/webapps/examples/WEB-INF/classes/HelloWorldExample.java
(original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/HelloWorldExample.java Wed
Dec 18 02:53:35 2013
@@ -41,10 +41,12 @@ public class HelloWorldExample extends H
ResourceBundle rb =
ResourceBundle.getBundle(LocalStrings,request.getLocale());
response.setContentType(text/html);
+response.setCharacterEncoding(UTF-8);
PrintWriter out = response.getWriter();
-out.println(html);
+out.println(!DOCTYPE htmlhtml);
out.println(head);
+out.println(meta charset=\UTF-8\ /);
String title = rb.getString(helloworld.title);
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/RequestHeaderExample.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/RequestHeaderExample.java?rev=1551814r1=1551813r2=1551814view=diff
==
--- tomcat/trunk/webapps/examples/WEB-INF/classes/RequestHeaderExample.java
(original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/RequestHeaderExample.java Wed
Dec 18 02:53:35 2013
@@ -48,10 +48,12 @@ public class RequestHeaderExample extend
throws IOException, ServletException
{
response.setContentType(text/html);
+response.setCharacterEncoding(UTF-8);
PrintWriter out = response.getWriter();
-out.println(html);
+out.println(!DOCTYPE htmlhtml);
out.println(head);
+out.println(meta charset=\UTF-8\ /);
String title = RB.getString(requestheader.title);
out.println(title + title + /title);
Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java?rev=1551814r1=1551813r2=1551814view=diff
==
--- tomcat/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java
(original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java Wed
Dec 18 02:53:35 2013
@@ -47,10 +47,12 @@ public class RequestInfoExample extends
throws IOException, ServletException
{
response.setContentType(text/html);
+response.setCharacterEncoding(UTF-8);
PrintWriter out = response.getWriter();
-out.println(html);
+out.println(!DOCTYPE htmlhtml);
out.println(head);
+out.println(meta charset=\UTF-8\ /);
String title = RB.getString(requestinfo.title);
out.println(title + title + /title);
Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/RequestParamExample.java
URL:
svn propchange: r1551814 - svn:log
Author: kpreisser Revision: 1551814 Modified property: svn:log Modified: svn:log at Wed Dec 18 02:55:06 2013 -- --- svn:log (original) +++ svn:log Wed Dec 18 02:55:06 2013 @@ -1,3 +1,3 @@ Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48550 Follow-Up to r1511468: -Fix example servlets to output text as UTF-8. This fixes encoding issues with the Request Parameters and Cookies as otherwise the browser would encode the form data with the document encoding (ISO-8859-1) but Tomcat will interpret it as UTF-8. +Fix example servlets to output text as UTF-8. This fixes encoding issues with the Request Parameters and Cookies servlet examples as otherwise the browser would encode the form data with the document encoding (ISO-8859-1) but Tomcat will interpret it as UTF-8. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
