[Bug 53697] New: java.lang.NullPointerException at org.apache.coyote.http11.Http11AprProcessor.actionInternal(Http11AprProcessor.java:277)
https://issues.apache.org/bugzilla/show_bug.cgi?id=53697 Priority: P2 Bug ID: 53697 Assignee: dev@tomcat.apache.org Summary: java.lang.NullPointerException at org.apache.coyote.http11.Http11AprProcessor.actionInte rnal(Http11AprProcessor.java:277) Severity: normal Classification: Unclassified OS: Linux Reporter: lac...@gmail.com Hardware: HP Status: NEW Version: 7.0.29 Component: Connectors Product: Tomcat 7 I hit tomcat with ~20 different urls in ~2 seconds, test some functionality, wait ~3 minutes, then do it again and I always get this exception and then I get (intermitent) connection interrupted messages in the browser. Here's the full trace: Aug 10, 2012 6:33:14 PM org.apache.catalina.connector.CoyoteAdapter event SEVERE: null Aug 10, 2012 6:33:14 PM org.apache.catalina.connector.CoyoteAdapter event java.lang.NullPointerException at org.apache.coyote.http11.Http11AprProcessor.actionInternal(Http11AprProcessor.java:277) at org.apache.coyote.http11.AbstractHttp11Processor.action(AbstractHttp11Processor.java:846) at org.apache.coyote.Response.action(Response.java:172) at org.apache.catalina.connector.CoyoteAdapter.event(CoyoteAdapter.java:229) at org.apache.coyote.http11.Http11AprProcessor.event(Http11AprProcessor.java:133) at org.apache.coyote.AbstractProtocol$AbstractConnectionHandler.process(AbstractProtocol.java:581) at org.apache.tomcat.util.net.AprEndpoint$SocketProcessor.run(AprEndpoint.java:1770) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1110) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:603) at java.lang.Thread.run(Thread.java:722) Aug 10, 2012 6:33:14 PM org.apache.coyote.http11.Http11AprProcessor event SEVERE: Error processing request java.lang.NullPointerException at org.apache.coyote.http11.Http11AprProcessor.actionInternal(Http11AprProcessor.java:277) at org.apache.coyote.http11.AbstractHttp11Processor.action(AbstractHttp11Processor.java:846) at org.apache.coyote.Request.action(Request.java:346) at org.apache.catalina.connector.Request.getRemoteAddr(Request.java:1281) at org.apache.catalina.connector.Request.getRemoteHost(Request.java:1296) at org.apache.catalina.valves.AccessLogValve$HostElement.addElement(AccessLogValve.java:1327) at org.apache.catalina.valves.AccessLogValve.log(AccessLogValve.java:953) at org.apache.catalina.core.AccessLogAdapter.log(AccessLogAdapter.java:51) at org.apache.catalina.core.ContainerBase.logAccess(ContainerBase.java:1263) at org.apache.catalina.core.ContainerBase.logAccess(ContainerBase.java:1270) at org.apache.catalina.connector.CoyoteAdapter.event(CoyoteAdapter.java:250) at org.apache.coyote.http11.Http11AprProcessor.event(Http11AprProcessor.java:133) at org.apache.coyote.AbstractProtocol$AbstractConnectionHandler.process(AbstractProtocol.java:581) at org.apache.tomcat.util.net.AprEndpoint$SocketProcessor.run(AprEndpoint.java:1770) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1110) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:603) at java.lang.Thread.run(Thread.java:722) Additional information: - hp Proliant DL360 with two 3ghz processors - CentOS 6.3 - One app runs websockets under bleading edge Atmosphere and Grails - the 20 urls come from chrome and firefox, simulatneously -- 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: r1371896 - in /tomcat/trunk: java/org/apache/jasper/runtime/ test/org/apache/jasper/runtime/ test/org/apache/tomcat/unittest/tags/ test/webapp-3.0/ test/webapp-3.0/WEB-INF/
Author: markt
Date: Sat Aug 11 09:43:19 2012
New Revision: 1371896
URL: http://svn.apache.org/viewvc?rev=1371896view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53545
Ensure buffered data is cleared when using a jsp:forward action to a static
resource inside classic a custom tag
Added:
tomcat/trunk/test/org/apache/jasper/runtime/
tomcat/trunk/test/org/apache/jasper/runtime/TestPageContextImpl.java
tomcat/trunk/test/org/apache/tomcat/unittest/tags/
tomcat/trunk/test/org/apache/tomcat/unittest/tags/Bug53545.java
tomcat/trunk/test/webapp-3.0/WEB-INF/bug53545.tld
tomcat/trunk/test/webapp-3.0/bug53545.html
tomcat/trunk/test/webapp-3.0/bug53545.jsp
Modified:
tomcat/trunk/java/org/apache/jasper/runtime/PageContextImpl.java
Modified: tomcat/trunk/java/org/apache/jasper/runtime/PageContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/runtime/PageContextImpl.java?rev=1371896r1=1371895r2=1371896view=diff
==
--- tomcat/trunk/java/org/apache/jasper/runtime/PageContextImpl.java (original)
+++ tomcat/trunk/java/org/apache/jasper/runtime/PageContextImpl.java Sat Aug 11
09:43:19 2012
@@ -715,6 +715,7 @@ public class PageContextImpl extends Pag
// JSP.4.5 If the buffer was flushed, throw IllegalStateException
try {
out.clear();
+baseOut.clear();
} catch (IOException ex) {
IllegalStateException ise = new IllegalStateException(Localizer
.getMessage(jsp.error.attempt_to_clear_flushed_buffer));
Added: tomcat/trunk/test/org/apache/jasper/runtime/TestPageContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/runtime/TestPageContextImpl.java?rev=1371896view=auto
==
--- tomcat/trunk/test/org/apache/jasper/runtime/TestPageContextImpl.java (added)
+++ tomcat/trunk/test/org/apache/jasper/runtime/TestPageContextImpl.java Sat
Aug 11 09:43:19 2012
@@ -0,0 +1,53 @@
+/*
+ * 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.jasper.runtime;
+
+import java.io.File;
+
+import javax.servlet.http.HttpServletResponse;
+
+import junit.framework.Assert;
+
+import org.junit.Test;
+
+import org.apache.catalina.startup.Tomcat;
+import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.tomcat.util.buf.ByteChunk;
+
+public class TestPageContextImpl extends TomcatBaseTest {
+
+@Test
+public void testDoForward() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+
+File appDir = new File(test/webapp-3.0);
+tomcat.addWebapp(null, /test, appDir.getAbsolutePath());
+
+tomcat.start();
+
+ByteChunk res = new ByteChunk();
+
+int rc = getUrl(http://localhost:; + getPort() +
+/test/bug53545.jsp, res, null);
+
+Assert.assertEquals(HttpServletResponse.SC_OK, rc);
+
+String body = res.toString();
+Assert.assertTrue(body.contains(OK));
+Assert.assertFalse(body.contains(FAIL));
+}
+}
Added: tomcat/trunk/test/org/apache/tomcat/unittest/tags/Bug53545.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/unittest/tags/Bug53545.java?rev=1371896view=auto
==
--- tomcat/trunk/test/org/apache/tomcat/unittest/tags/Bug53545.java (added)
+++ tomcat/trunk/test/org/apache/tomcat/unittest/tags/Bug53545.java Sat Aug 11
09:43:19 2012
@@ -0,0 +1,23 @@
+/*
+ * 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
svn commit: r1371900 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/jasper/runtime/ modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/
Author: markt
Date: Sat Aug 11 09:52:40 2012
New Revision: 1371900
URL: http://svn.apache.org/viewvc?rev=1371900view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53545
Ensure buffered data is cleared when using a jsp:forward action to a static
resource inside classic a custom tag
Added:
tomcat/tc7.0.x/trunk/test/org/apache/jasper/runtime/
- copied from r1371896, tomcat/trunk/test/org/apache/jasper/runtime/
tomcat/tc7.0.x/trunk/test/org/apache/jasper/runtime/TestPageContextImpl.java
- copied unchanged from r1371896,
tomcat/trunk/test/org/apache/jasper/runtime/TestPageContextImpl.java
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/unittest/tags/
- copied from r1371896, tomcat/trunk/test/org/apache/tomcat/unittest/tags/
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/unittest/tags/Bug53545.java
- copied unchanged from r1371896,
tomcat/trunk/test/org/apache/tomcat/unittest/tags/Bug53545.java
tomcat/tc7.0.x/trunk/test/webapp-3.0/WEB-INF/bug53545.tld
- copied unchanged from r1371896,
tomcat/trunk/test/webapp-3.0/WEB-INF/bug53545.tld
tomcat/tc7.0.x/trunk/test/webapp-3.0/bug53545.html
- copied unchanged from r1371896,
tomcat/trunk/test/webapp-3.0/bug53545.html
tomcat/tc7.0.x/trunk/test/webapp-3.0/bug53545.jsp
- copied unchanged from r1371896,
tomcat/trunk/test/webapp-3.0/bug53545.jsp
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/PageContextImpl.java
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/
(props changed)
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/
(props changed)
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1371896
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/PageContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/PageContextImpl.java?rev=1371900r1=1371899r2=1371900view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/PageContextImpl.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/PageContextImpl.java
Sat Aug 11 09:52:40 2012
@@ -723,6 +723,7 @@ public class PageContextImpl extends Pag
// JSP.4.5 If the buffer was flushed, throw IllegalStateException
try {
out.clear();
+baseOut.clear();
} catch (IOException ex) {
IllegalStateException ise = new IllegalStateException(Localizer
.getMessage(jsp.error.attempt_to_clear_flushed_buffer));
Propchange:
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/
--
Merged
/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool:r1371896
Propchange:
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/
--
Merged
/tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test:r1371896
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=1371900r1=1371899r2=1371900view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sat Aug 11 09:52:40 2012
@@ -135,6 +135,14 @@
/fix
/changelog
/subsection
+ subsection name=Jasper
+changelog
+ fix
+bug53545/bug: Ensure buffered data is cleared when using a
+jsp:forward action inside a classic custom tag. (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
[Bug 53545] jsp:forward action to static resources causes IllegalStateException when inside classic custom tag
https://issues.apache.org/bugzilla/show_bug.cgi?id=53545 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |FIXED --- Comment #4 from Mark Thomas ma...@apache.org --- This has been fixed in trunk and 7.0.x and will be included in 7.0.30 onwards. I also added a test case to the unit tests for this issue. -- 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
[GUMP@vmgump]: Project tomcat-taglibs-standard (in module tomcat-taglibs) failed
To whom it may engage...
This is an automated request, but not an unsolicited one. For
more information please visit http://gump.apache.org/nagged.html,
and/or contact the folk at gene...@gump.apache.org.
Project tomcat-taglibs-standard has an issue affecting its community
integration.
This issue affects 2 projects,
and has been outstanding for 6 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-taglibs-standard : Standard Taglib
- tomcat-taglibs-standard-install : JSP Taglibs
Full details are available at:
http://vmgump.apache.org/gump/public/tomcat-taglibs/tomcat-taglibs-standard/index.html
That said, some information snippets are provided here.
The following annotations (debug/informational/warning/error messages) were
provided:
-INFO- Optional dependency httpunit failed with reason build failed
-DEBUG- (Apache Gump generated) Apache Maven Settings in:
/srv/gump/public/workspace/tomcat-taglibs/standard/gump_mvn_settings.xml
-INFO- Failed with reason build failed
-DEBUG- Maven POM in:
/srv/gump/public/workspace/tomcat-taglibs/standard/pom.xml
-INFO- Failed to extract fallback artifacts from Gump Repository
The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-taglibs/tomcat-taglibs-standard/gump_work/build_tomcat-taglibs_tomcat-taglibs-standard.html
Work Name: build_tomcat-taglibs_tomcat-taglibs-standard (Type: Build)
Work ended in a state of : Failed
Elapsed: 20 secs
Command Line: /opt/maven2/bin/mvn --batch-mode -DskipTests=true --settings
/srv/gump/public/workspace/tomcat-taglibs/standard/gump_mvn_settings.xml
install
[Working Directory: /srv/gump/public/workspace/tomcat-taglibs/standard]
M2_HOME: /opt/maven2
-
[INFO] [compiler:compile {execution: default-compile}]
[INFO] Nothing to compile - all classes are up to date
[debug] execute contextualize
[INFO] [resources:testResources {execution: default-testResources}]
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory
/srv/gump/public/workspace/tomcat-taglibs/standard/spec/src/test/resources
[INFO] Copying 3 resources
[INFO] [compiler:testCompile {execution: default-testCompile}]
[INFO] No sources to compile
[INFO] [surefire:test {execution: default-test}]
[INFO] Tests are skipped.
[INFO] [bundle:bundle {execution: default-bundle}]
[INFO] [install:install {execution: default-install}]
[INFO] Installing
/srv/gump/public/workspace/tomcat-taglibs/standard/spec/target/taglibs-standard-spec-1.2-SNAPSHOT.jar
to
/srv/gump/public/workspace/mvnlocalrepo/shared/org/apache/taglibs/taglibs-standard-spec/1.2-SNAPSHOT/taglibs-standard-spec-1.2-SNAPSHOT.jar
[INFO] [bundle:install {execution: default-install}]
[INFO] Parsing
file:/srv/gump/public/workspace/mvnlocalrepo/shared/repository.xml
[INFO] Installing
org/apache/taglibs/taglibs-standard-spec/1.2-SNAPSHOT/taglibs-standard-spec-1.2-SNAPSHOT.jar
[INFO] Writing OBR metadata
[INFO]
[INFO] Building JSTL Implementation
[INFO]task-segment: [install]
[INFO]
[INFO] [remote-resources:process {execution: default}]
[INFO] snapshot org.apache.taglibs:taglibs-standard-spec:1.2-SNAPSHOT: checking
for updates from apache.snapshots
[debug] execute contextualize
[INFO] [resources:resources {execution: default-resources}]
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 14 resources
[INFO] Copying 3 resources
[INFO] [compiler:compile {execution: default-compile}]
[INFO] Compiling 96 source files to
/srv/gump/public/workspace/tomcat-taglibs/standard/impl/target/classes
[INFO] -
[ERROR] COMPILATION ERROR :
[INFO] -
[ERROR]
/srv/gump/public/workspace/tomcat-taglibs/standard/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java:[38,7]
error: DataSourceWrapper is not abstract and does not override abstract method
getParentLogger() in CommonDataSource
[INFO] 1 error
[INFO] -
[INFO]
[ERROR] BUILD FAILURE
[INFO]
[INFO] Compilation failure
/srv/gump/public/workspace/tomcat-taglibs/standard/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java:[38,7]
error: DataSourceWrapper is not abstract and does not override abstract method
getParentLogger() in CommonDataSource
[INFO]
[INFO] For more information, run Maven with the -e switch
[INFO]
svn commit: r1371976 - /tomcat/trunk/BUILDING.txt
Author: kkolinko Date: Sat Aug 11 16:55:35 2012 New Revision: 1371976 URL: http://svn.apache.org/viewvc?rev=1371976view=rev Log: Rephrase. It is followup to my r1371017. Modified: tomcat/trunk/BUILDING.txt Modified: tomcat/trunk/BUILDING.txt URL: http://svn.apache.org/viewvc/tomcat/trunk/BUILDING.txt?rev=1371976r1=1371975r2=1371976view=diff == --- tomcat/trunk/BUILDING.txt (original) +++ tomcat/trunk/BUILDING.txt Sat Aug 11 16:55:35 2012 @@ -44,20 +44,26 @@ source distribution, do the following: http://openjdk.java.net/install/index.html or another JDK vendor. -Note: - Apache Tomcat builds a private copy of the Apache Commons DBCP - library, which is used to provide support for database connection - pooling. As far as java.sql interfaces differ in different Java - versions, the library can be successfully compiled only with the - specified version of JDK. +Note regarding later versions of Java: - See Apache Commons DBCP project web site for more details, - http://commons.apache.org/dbcp/ + As documented elsewhere, one of components in Apache Tomcat includes + a private copy of the Apache Commons DBCP library. The source code + for this library is downloaded, processed by the build script + (renaming the packages) and compiled. + + Due to changes in JDBC interfaces implemented by the library between + versions of Java SE specification, the library has to target specific + version of Java and can be compiled only with the JDK version + implementing this version of specification. + + See Apache Commons DBCP project web site for more details on + available versions of the library and its requirements, + +http://commons.apache.org/dbcp/ If you really want to use a later version of JDK to build Tomcat, - several workarounds are possible. One of them is to skip building the - library. Note though that you might not be able to create a release - without it. + several workarounds are possible. One of them is to skip building + the component (tomcat-dbcp.jar). 3. Install the JDK according to the instructions included with the release. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1371978 - /tomcat/trunk/webapps/docs/building.xml
Author: kkolinko Date: Sat Aug 11 17:10:54 2012 New Revision: 1371978 URL: http://svn.apache.org/viewvc?rev=1371978view=rev Log: Adjust wording. Followup to r1371017. Modified: tomcat/trunk/webapps/docs/building.xml Modified: tomcat/trunk/webapps/docs/building.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/building.xml?rev=1371978r1=1371977r2=1371978view=diff == --- tomcat/trunk/webapps/docs/building.xml (original) +++ tomcat/trunk/webapps/docs/building.xml Sat Aug 11 17:10:54 2012 @@ -45,7 +45,7 @@ Tomcat. The following is a step by step section name=Download a Java Development Kit (JDK) version 7 p -Tomcat requires a JDK (version 7) to be installed. You can download one frombr / +Building Apache Tomcat requires a JDK (version 7) to be installed. You can download one frombr / a href=http://www.oracle.com/technetwork/java/javase/downloads/index.html;http://www.oracle.com/technetwork/java/javase/downloads/index.html/abr/ a href=http://openjdk.java.net/install/index.html;http://openjdk.java.net/install/index.html/abr/ or another JDK vendor. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1371983 - in /tomcat/tc7.0.x/trunk: ./ BUILDING.txt webapps/docs/building.xml webapps/docs/changelog.xml
Author: kkolinko Date: Sat Aug 11 17:23:27 2012 New Revision: 1371983 URL: http://svn.apache.org/viewvc?rev=1371983view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53601 Clarify that building Tomcat 7 from sources requires Java 6 JDK. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/BUILDING.txt tomcat/tc7.0.x/trunk/webapps/docs/building.xml tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1371017,1371976,1371978 Modified: tomcat/tc7.0.x/trunk/BUILDING.txt URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/BUILDING.txt?rev=1371983r1=1371982r2=1371983view=diff == --- tomcat/tc7.0.x/trunk/BUILDING.txt (original) +++ tomcat/tc7.0.x/trunk/BUILDING.txt Sat Aug 11 17:23:27 2012 @@ -37,10 +37,32 @@ source distribution, do the following: 1. If the JDK is already installed, skip to (2). - 2. Download a Java Development Kit (JDK) release (version 1.6.x or later) -from: + 2. Download a version 6 of Java Development Kit (JDK) release (use the +latest update available for your chosen version) from http://www.oracle.com/technetwork/java/javase/downloads/index.html +or from another JDK vendor. + +Note regarding later versions of Java: + + As documented elsewhere, one of components in Apache Tomcat includes + a private copy of the Apache Commons DBCP library. The source code + for this library is downloaded, processed by the build script + (renaming the packages) and compiled. + + Due to changes in JDBC interfaces implemented by the library between + versions of Java SE specification, the library has to target specific + version of Java and can be compiled only with the JDK version + implementing this version of specification. + + See Apache Commons DBCP project web site for more details on + available versions of the library and its requirements, + +http://commons.apache.org/dbcp/ + + If you really want to use a later version of JDK to build Tomcat, + several workarounds are possible. One of them is to skip building + the component (tomcat-dbcp.jar). 3. Install the JDK according to the instructions included with the release. Modified: tomcat/tc7.0.x/trunk/webapps/docs/building.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/building.xml?rev=1371983r1=1371982r2=1371983view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/building.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/building.xml Sat Aug 11 17:23:27 2012 @@ -42,12 +42,12 @@ Tomcat. The following is a step by step /section -section name=Download a Java Development Kit (JDK) 1.6 or later +section name=Download a Java Development Kit (JDK) version 6 p -Tomcat requires a JDK (version 1.6 or later) to be installed. -br/The Sun JDK can be downloaded -a href=http://www.oracle.com/technetwork/java/javase/downloads/index.html;here/a. +Building Apache Tomcat requires a JDK (version 6) to be installed. You can download one frombr / +a href=http://www.oracle.com/technetwork/java/javase/downloads/index.html;http://www.oracle.com/technetwork/java/javase/downloads/index.html/abr/ +or from another JDK vendor. /p p 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=1371983r1=1371982r2=1371983view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sat Aug 11 17:23:27 2012 @@ -170,6 +170,10 @@ (markt) /fix fix +bug53601/bug: Clarify in documentation that building Apache Tomcat 7 +from sources requires a Java 6 JDK. (kkolinko) + /fix + fix bug53653/bug: Allow for wrapped source code example in config/context.html. Patch provided by Terence Bandoian. (schultz) /fix - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53601] tomcat8 build fails with jdk1.6
https://issues.apache.org/bugzilla/show_bug.cgi?id=53601 Konstantin Kolinko knst.koli...@gmail.com changed: What|Removed |Added Component|Catalina|Documentation Summary|tomcat7 build fails with|tomcat8 build fails with |jdk1.6 |jdk1.6 --- Comment #5 from Konstantin Kolinko knst.koli...@gmail.com --- Changed Summary to align with the actual issue. I updated Tomcat 7 docs as well, r1371983. It will be in 7.0.30. Thank you for reporting this documentation inconsistency. -- 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: r1371985 - in /tomcat/tc6.0.x/trunk: BUILDING.txt webapps/docs/building.xml webapps/docs/changelog.xml
Author: kkolinko Date: Sat Aug 11 18:19:13 2012 New Revision: 1371985 URL: http://svn.apache.org/viewvc?rev=1371985view=rev Log: For https://issues.apache.org/bugzilla/show_bug.cgi?id=53601 Clarify that to build Apache Tomcat 6 from sources a Java 5 JDK is recommended. Modified: tomcat/tc6.0.x/trunk/BUILDING.txt tomcat/tc6.0.x/trunk/webapps/docs/building.xml tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc6.0.x/trunk/BUILDING.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/BUILDING.txt?rev=1371985r1=1371984r2=1371985view=diff == --- tomcat/tc6.0.x/trunk/BUILDING.txt (original) +++ tomcat/tc6.0.x/trunk/BUILDING.txt Sat Aug 11 18:19:13 2012 @@ -37,9 +37,31 @@ source distribution, do the following: * If the JDK is already installed, skip to (1). -* Download a Java Development Kit (JDK) release (version 1.5.x or later) from: +* Download a Java Development Kit (JDK) of Java SE version 5 from -http://java.sun.com/j2se/ +http://www.oracle.com/technetwork/java/javase/downloads/index.html +or from another JDK vendor. + + Note regarding versions of Java later than Java SE 5: + +As documented elsewhere, one of components in Apache Tomcat includes +a private copy of the Apache Commons DBCP library. The source code +for this library is downloaded, processed by the build script +(renaming the packages) and compiled. + +Due to changes in JDBC interfaces implemented by the library between +versions of Java SE specification, the library has to target specific +version of Java and can be compiled only with the JDK version +implementing this version of specification. + +See Apache Commons DBCP project web site for more details on +available versions of the library and its requirements, + + http://commons.apache.org/dbcp/ + + It is possible to use later versions of JDK to build Tomcat 6.0, but the + building of that component (tomcat-dbcp.jar) will be skipped and a + warning will be printed. * Install the JDK according to the instructions included with the release. Modified: tomcat/tc6.0.x/trunk/webapps/docs/building.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/building.xml?rev=1371985r1=1371984r2=1371985view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/building.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/building.xml Sat Aug 11 18:19:13 2012 @@ -42,10 +42,11 @@ Tomcat. The following is a step by step /section -section name=Download a Java Development Kit (JDK) release (version 1.5.x or later) +section name=Download a Java Development Kit (JDK) release (version 5) p -The Sun JDK can be downloaded a href=http://java.sun.com/j2se/;here/a. +The JDK can be downloaded following the Previous Releases link from +a href=http://www.oracle.com/technetwork/java/javase/downloads/index.html;here/a. /p p 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=1371985r1=1371984r2=1371985view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sat Aug 11 18:19:13 2012 @@ -315,6 +315,10 @@ bug53664/bug: Minor JNDI Howto document enhancement concerning mail properties. Patch provided by Mark Eggers. (schultz) /fix + fix +bug53601/bug: Clarify that to build Apache Tomcat 6 from sources +a Java 5 JDK is recommended. (kkolinko) + /fix /changelog /subsection subsection name=Other - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53574] metadata-complete=true and servlet defined as jsp not working
https://issues.apache.org/bugzilla/show_bug.cgi?id=53574 --- Comment #2 from Mark Thomas ma...@apache.org --- This looks like a Tomcat bug. I have a test case for trunk that reproduces this and am working on a fix. -- 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: r1371995 - in /tomcat/trunk: java/org/apache/catalina/startup/ContextConfig.java test/org/apache/catalina/startup/TestContextConfig.java test/webapp-3.0/WEB-INF/jsp/ test/webapp-3.0/WEB-IN
Author: markt
Date: Sat Aug 11 18:54:53 2012
New Revision: 1371995
URL: http://svn.apache.org/viewvc?rev=1371995view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53574
Ensure Servlets defined using jsp-file are available when metadata-complete is
true.
Added:
tomcat/trunk/test/webapp-3.0/WEB-INF/jsp/
tomcat/trunk/test/webapp-3.0/WEB-INF/jsp/bug53574.jsp
Modified:
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/test/org/apache/catalina/startup/TestContextConfig.java
tomcat/trunk/test/webapp-3.0/WEB-INF/web.xml
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1371995r1=1371994r2=1371995view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Sat Aug 11
18:54:53 2012
@@ -1245,6 +1245,7 @@ public class ContextConfig implements Li
}
} else {
webXml.merge(defaults);
+convertJsps(webXml);
webXml.configureContext(context);
}
Modified: tomcat/trunk/test/org/apache/catalina/startup/TestContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestContextConfig.java?rev=1371995r1=1371994r2=1371995view=diff
==
--- tomcat/trunk/test/org/apache/catalina/startup/TestContextConfig.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TestContextConfig.java Sat
Aug 11 18:54:53 2012
@@ -29,6 +29,8 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import junit.framework.Assert;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -94,6 +96,26 @@ public class TestContextConfig extends T
assertTrue(bc.toString().contains(pOK/p));
}
+@Test
+public void testBug53574() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+
+File appDir = new File(test/webapp-3.0);
+tomcat.addWebapp(null, /test, appDir.getAbsolutePath());
+
+tomcat.start();
+
+ByteChunk res = new ByteChunk();
+
+int rc = getUrl(http://localhost:; + getPort() +
+/test/bug53574, res, null);
+
+Assert.assertEquals(HttpServletResponse.SC_OK, rc);
+
+String body = res.toString();
+Assert.assertTrue(body.contains(OK));
+}
+
private static class CustomDefaultServletSCI
implements ServletContainerInitializer {
Added: tomcat/trunk/test/webapp-3.0/WEB-INF/jsp/bug53574.jsp
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-3.0/WEB-INF/jsp/bug53574.jsp?rev=1371995view=auto
==
--- tomcat/trunk/test/webapp-3.0/WEB-INF/jsp/bug53574.jsp (added)
+++ tomcat/trunk/test/webapp-3.0/WEB-INF/jsp/bug53574.jsp Sat Aug 11 18:54:53
2012
@@ -0,0 +1,21 @@
+%--
+ 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.
+--%
+html
+ body
+pOK/p
+ /body
+/html
\ No newline at end of file
Modified: tomcat/trunk/test/webapp-3.0/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-3.0/WEB-INF/web.xml?rev=1371995r1=1371994r2=1371995view=diff
==
--- tomcat/trunk/test/webapp-3.0/WEB-INF/web.xml (original)
+++ tomcat/trunk/test/webapp-3.0/WEB-INF/web.xml Sat Aug 11 18:54:53 2012
@@ -113,6 +113,15 @@
url-pattern/testStandardWrapper/securityAnnotationsMetaDataPriority/url-pattern
/servlet-mapping
+ servlet
+servlet-nameBug53574/servlet-name
+jsp-file/WEB-INF/jsp/bug53574.jsp/jsp-file
+ /servlet
+ servlet-mapping
+servlet-nameBug53574/servlet-name
+url-pattern/bug53574/url-pattern
+ /servlet-mapping
+
login-config
auth-methodBASIC/auth-method
/login-config
svn commit: r1371997 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/startup/ test/org/apache/catalina/startup/ test/webapp-3.0/WEB-INF/ test/webapp-3.0/WEB-INF/jsp/ webapps/docs/
Author: markt
Date: Sat Aug 11 18:58:49 2012
New Revision: 1371997
URL: http://svn.apache.org/viewvc?rev=1371997view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53574
Ensure Servlets defined using jsp-file are available when metadata-complete is
true.
Added:
tomcat/tc7.0.x/trunk/test/webapp-3.0/WEB-INF/jsp/
- copied from r1371995, tomcat/trunk/test/webapp-3.0/WEB-INF/jsp/
tomcat/tc7.0.x/trunk/test/webapp-3.0/WEB-INF/jsp/bug53574.jsp
- copied unchanged from r1371995,
tomcat/trunk/test/webapp-3.0/WEB-INF/jsp/bug53574.jsp
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestContextConfig.java
tomcat/tc7.0.x/trunk/test/webapp-3.0/WEB-INF/web.xml
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1371995
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1371997r1=1371996r2=1371997view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
Sat Aug 11 18:58:49 2012
@@ -1339,6 +1339,7 @@ public class ContextConfig implements Li
}
} else {
webXml.merge(defaults);
+convertJsps(webXml);
webXml.configureContext(context);
}
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestContextConfig.java?rev=1371997r1=1371996r2=1371997view=diff
==
---
tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestContextConfig.java
(original)
+++
tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestContextConfig.java
Sat Aug 11 18:58:49 2012
@@ -29,6 +29,8 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import junit.framework.Assert;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -94,6 +96,26 @@ public class TestContextConfig extends T
assertTrue(bc.toString().contains(pOK/p));
}
+@Test
+public void testBug53574() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+
+File appDir = new File(test/webapp-3.0);
+tomcat.addWebapp(null, /test, appDir.getAbsolutePath());
+
+tomcat.start();
+
+ByteChunk res = new ByteChunk();
+
+int rc = getUrl(http://localhost:; + getPort() +
+/test/bug53574, res, null);
+
+Assert.assertEquals(HttpServletResponse.SC_OK, rc);
+
+String body = res.toString();
+Assert.assertTrue(body.contains(OK));
+}
+
private static class CustomDefaultServletSCI
implements ServletContainerInitializer {
Modified: tomcat/tc7.0.x/trunk/test/webapp-3.0/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/webapp-3.0/WEB-INF/web.xml?rev=1371997r1=1371996r2=1371997view=diff
==
--- tomcat/tc7.0.x/trunk/test/webapp-3.0/WEB-INF/web.xml (original)
+++ tomcat/tc7.0.x/trunk/test/webapp-3.0/WEB-INF/web.xml Sat Aug 11 18:58:49
2012
@@ -113,6 +113,15 @@
url-pattern/testStandardWrapper/securityAnnotationsMetaDataPriority/url-pattern
/servlet-mapping
+ servlet
+servlet-nameBug53574/servlet-name
+jsp-file/WEB-INF/jsp/bug53574.jsp/jsp-file
+ /servlet
+ servlet-mapping
+servlet-nameBug53574/servlet-name
+url-pattern/bug53574/url-pattern
+ /servlet-mapping
+
login-config
auth-methodBASIC/auth-method
/login-config
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=1371997r1=1371996r2=1371997view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sat Aug 11 18:58:49 2012
@@ -103,6 +103,10 @@
VirtualDirContext. Patch provided by Philip Zuev. (markt)
/fix
fix
+bug53574/bug: Ensure Servlets defined using jsp-file are available
+when metadata-complete is true. (markt)
+ /fix
+ fix
bug53584/bug: Ignore path parameters when comparing URIs for FORM
authentication. This prevents users being
[Bug 53574] metadata-complete=true and servlet defined as jsp not working
https://issues.apache.org/bugzilla/show_bug.cgi?id=53574 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #3 from Mark Thomas ma...@apache.org --- This has been fixed in trunk and 7.0.x and will be included in 7.0.30 onwards. -- 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: r1371999 - /tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
Author: markt Date: Sat Aug 11 19:14:30 2012 New Revision: 1371999 URL: http://svn.apache.org/viewvc?rev=1371999view=rev Log: Update comments after confirmation from EG Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1371999r1=1371998r2=1371999view=diff == --- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original) +++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Sat Aug 11 19:14:30 2012 @@ -1122,9 +1122,9 @@ public class ContextConfig implements Li * - As per http://java.net/jira/browse/SERVLET_SPEC-36, if the main * web.xml is marked as metadata-complete, JARs are still processed * for SCIs. - * - TBD. If metadata-complete=true and an absolute ordering is - * specified, are JARs excluded from the ordering also excluded from - * the SCI processing? Current assumption is that they are. + * - If metadata-complete=true and an absolute ordering is specified, + * JARs excluded from the ordering are also excluded from the SCI + * processing. * - If an SCI has a @HandlesType annotation then all classes (except * those in JARs excluded from an absolute ordering) need to be * scanned to check if they match. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53531] ExpandWar.expand does not check the return value of File.mkdir and File.mkdirs
https://issues.apache.org/bugzilla/show_bug.cgi?id=53531 --- Comment #6 from Konstantin Kolinko knst.koli...@gmail.com --- Created attachment 29212 -- https://issues.apache.org/bugzilla/attachment.cgi?id=29212action=edit 2012-08-11_tc55_53531.patch Patch for Tomcat 5.5. Includes a fix for missing message argument in ContextConfig.init(). That is where the thrown IOException is caught and logged. -- 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: r1372002 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: kkolinko Date: Sat Aug 11 19:26:30 2012 New Revision: 1372002 URL: http://svn.apache.org/viewvc?rev=1372002view=rev Log: Update Christopher Schultz' proposal with an actual patch. I am keeping Christopher's vote. The difference between this patch and his fix in TC6 is trivial. Modified: tomcat/tc5.5.x/trunk/STATUS.txt Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1372002r1=1372001r2=1372002view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Sat Aug 11 19:26:30 2012 @@ -60,7 +60,7 @@ PATCHES PROPOSED TO BACKPORT: http://localhost:8080/servlets-examples/servlet/RequestHeaderExample Refreshing the page in Firefox changes the number of headers in incoming request - (+= 'cache-control' for F5, += 'pragma=no-cache' for Ctrl+F5 refresh). + (adds 'cache-control' for F5 refresh, adds 'pragma=no-cache' for Ctrl+F5 refresh). Patch: http://people.apache.org/~kkolinko/patches/2012-07-03_tc55_maxHeaderCount_v1.patch @@ -69,8 +69,10 @@ PATCHES PROPOSED TO BACKPORT: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53531 ExpandWar.expand does not check the return value of File.mkdirs. - Note that this is not a backport -- it's just a fix for 5.5.x. - Patch is attached to BZ ticket. - +1: schultz + Provide better message when a war file cannot be unpacked due to failure + to create a directory. Fix missing message argument in ContextConfig.init(). + kkolinko: Updated patch: + https://issues.apache.org/bugzilla/attachment.cgi?id=29212 + +1: schultz, kkolinko -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1372003 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/startup/ContextConfig.java webapps/docs/changelog.xml
Author: markt Date: Sat Aug 11 19:27:52 2012 New Revision: 1372003 URL: http://svn.apache.org/viewvc?rev=1372003view=rev Log: Update comments and change-log post clarification from the Servlet EG Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1371999 Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1372003r1=1372002r2=1372003view=diff == --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java Sat Aug 11 19:27:52 2012 @@ -1216,9 +1216,9 @@ public class ContextConfig implements Li * - As per http://java.net/jira/browse/SERVLET_SPEC-36, if the main * web.xml is marked as metadata-complete, JARs are still processed * for SCIs. - * - TBD. If metadata-complete=true and an absolute ordering is - * specified, are JARs excluded from the ordering also excluded from - * the SCI processing? Current assumption is that they are. + * - If metadata-complete=true and an absolute ordering is specified, + * JARs excluded from the ordering are also excluded from the SCI + * processing. * - If an SCI has a @HandlesType annotation then all classes (except * those in JARs excluded from an absolute ordering) need to be * scanned to check if they match. 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=1372003r1=1372002r2=1372003view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sat Aug 11 19:27:52 2012 @@ -238,9 +238,12 @@ declared in web.xml - unless metadata complete is set to true. (markt) /fix fix -As per clarification from the Servlet Expert Group, JARs are always -checked for ServletContainerInitializers regardless of the setting of -metadata complete. (markt) +bug53619/bugAs per clarification from the Servlet Expert Group, +JARs will always be scanned for ServletContainerInitializers regardless +of the setting of metadata complete. However, if an absolute ordering is +specified and a JAR is excluded from that ordering it will not be +scanned for ServletContainerInitializers nor will it be scanned for +matches to any HandleTypes annotations. (markt) /fix add bug53465/bug: Populate mapped-name property for resources defined in - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53619] If absolute-ordering is defined, only fragments mentioned in it shall get class-scanned
https://issues.apache.org/bugzilla/show_bug.cgi?id=53619 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #2 from Mark Thomas ma...@apache.org --- The required behaviour has been present from 7.0.29 onwards in anticipation of the clarification from the EG. -- 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 53697] java.lang.NullPointerException at org.apache.coyote.http11.Http11AprProcessor.actionInternal(Http11AprProcessor.java:277)
https://issues.apache.org/bugzilla/show_bug.cgi?id=53697 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |WONTFIX --- Comment #1 from Mark Thomas ma...@apache.org --- Without a test case to reproduce the problem there is little the Tomcat developers can do. It looks like multiple threads are acting on the same socket at the same time. What I can't tell is if that is intentional, the result of a Tomcat bug or something the frameworks/app is doing. The NPE is avoidable in one of the two stack traces provided but I am not yet sure avoiding it is a good thing (depending on the root cause). I would add that a test case isn't essential - the Tomcat developers have made changes in the past for hard to reproduce bugs based purely on the bug reporters analysis of their code, the Tomcat code and what is going wrong where. That said, it is also the case that the Tomcat developers have refused to apply speculative patches that the bug reporter claims fixes the issue that did not come with an explanation of what the bug was and why the patch fixed it. -- 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: r1372031 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/filters/CsrfPreventionFilter.java webapps/docs/changelog.xml
Author: kkolinko
Date: Sat Aug 11 21:34:11 2012
New Revision: 1372031
URL: http://svn.apache.org/viewvc?rev=1372031view=rev
Log:
Fix conflict with CSRF protection filter and clustering. Cache needs to be
serializable.
It is backport of r1083987 from 7.0.x
(markt)
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.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=1372031r1=1372030r2=1372031view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Aug 11 21:34:11 2012
@@ -28,12 +28,6 @@ RELEASE SHOWSTOPPERS:
PATCHES ACCEPTED TO BACKPORT:
[ start all new proposals below, under PATCHES PROPOSED. ]
-* Fix conflict with CSRF protection filter and clustering
- Cache needs to be serializable
-
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java?r1=1083987r2=1083986pathrev=1083987
- +1: markt, kkolinko, rjung
- -1:
-
PATCHES PROPOSED TO BACKPORT:
[ New proposals should be added at the end of the list ]
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java?rev=1372031r1=1372030r2=1372031view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java
Sat Aug 11 21:34:11 2012
@@ -18,6 +18,7 @@
package org.apache.catalina.filters;
import java.io.IOException;
+import java.io.Serializable;
import java.security.SecureRandom;
import java.util.HashSet;
import java.util.LinkedHashMap;
@@ -294,7 +295,9 @@ public class CsrfPreventionFilter extend
}
}
-private static class LruCacheT {
+protected static class LruCacheT implements Serializable {
+
+private static final long serialVersionUID = 1L;
// Although the internal implementation uses a Map, this cache
// implementation is only concerned with the keys.
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=1372031r1=1372030r2=1372031view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sat Aug 11 21:34:11 2012
@@ -174,6 +174,11 @@
bug53531/bug: Fix ExpandWar.expand to check the return value of
File.mkdir and File.mkdirs. (schultz)
/fix
+ fix
+Make the CSRF nonce cache in codeCsrfPreventionFilter/code
+serializable so that it can be replicated across a cluster and/or
+persisted across Tomcat restarts. (markt)
+ /fix
/changelog
/subsection
subsection name=Coyote
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1372035 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/tomcat/util/net/NioEndpoint.java webapps/docs/changelog.xml
Author: kkolinko
Date: Sat Aug 11 21:59:31 2012
New Revision: 1372035
URL: http://svn.apache.org/viewvc?rev=1372035view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52858
Fix high CPU load with SSL, NIO and sendfile when
client breaks the connection before reading all the requested data.
Avoids BZ 53138. Backport of r1300948, r1340218, r1342468
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.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=1372035r1=1372034r2=1372035view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Aug 11 21:59:31 2012
@@ -80,25 +80,6 @@ PATCHES PROPOSED TO BACKPORT:
request parsing, so only broken webapps may break, not broken clients.
-1:
-* Fix bug https://issues.apache.org/bugzilla/show_bug.cgi?id=52858
- http://svn.apache.org/viewvc?rev=1300948view=rev
- +1: fhanik, markt, rjung
- -1:
- rjung: Isn't this only fixing the regression introduced by 52858 (BZ 53138)
- but 52858 will be again unfixed?
- -1: kkolinko: unless r1340218 is backported as well (I agree with rjung's
- concern). Proposed below.
-
- Additional patch:
- kkolinko: Regarding r1340218: Note, that reg argument in all existing
- calls to processSendfile() is always true. The actual change in this
- revision is registering for OP_WRITE regardless of the value of
- attachment.interestOps()
- http://svn.apache.org/viewvc?view=revisionrevision=1340218 (fix BZ 53138)
- http://svn.apache.org/viewvc?view=revisionrevision=1342468 (cleanup)
- +1: kkolinko, markt, schultz
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52918
Add WebSocket support to Tomcat 6
+1: fhanik
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1372035r1=1372034r2=1372035view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Sat
Aug 11 21:59:31 2012
@@ -1713,8 +1713,14 @@ public class NioEndpoint extends Abstrac
public boolean processSendfile(SelectionKey sk, KeyAttachment
attachment, boolean reg, boolean event) {
NioChannel sc = null;
try {
-//unreg(sk,attachment);//only do this if we do process send
file on a separate thread
+unreg(sk, attachment, sk.readyOps());
SendfileData sd = attachment.getSendfileData();
+
+if (log.isTraceEnabled()) {
+log.trace(Processing send file for: + sd.fileName);
+}
+
+//setup the file channel
if ( sd.fchannel == null ) {
File f = new File(sd.fileName);
if ( !f.exists() ) {
@@ -1723,10 +1729,14 @@ public class NioEndpoint extends Abstrac
}
sd.fchannel = new FileInputStream(f).getChannel();
}
+
+//configure output channel
sc = attachment.getChannel();
sc.setSendFile(true);
+//ssl channel is slightly different
WritableByteChannel wc =(WritableByteChannel) ((sc instanceof
SecureNioChannel)?sc:sc.getIOChannel());
-
+
+//we still have data in the buffer
if (sc.getOutboundRemaining()0) {
if (sc.flushOutbound()) {
attachment.access();
@@ -1753,15 +1763,13 @@ public class NioEndpoint extends Abstrac
attachment.setSendfileData(null);
try {sd.fchannel.close();}catch(Exception ignore){}
if ( sd.keepAlive ) {
-if (reg) {
-if (log.isDebugEnabled()) {
-log.debug(Connection is keep alive,
registering back for OP_READ);
-}
-if (event) {
-
this.add(attachment.getChannel(),SelectionKey.OP_READ);
-} else {
-reg(sk,attachment,SelectionKey.OP_READ);
-}
+if (log.isDebugEnabled()) {
+log.debug(Connection is keep alive, registering
back for OP_READ);
+}
+if (event) {
+
this.add(attachment.getChannel(),SelectionKey.OP_READ);
+
[Bug 52858] High CPU load in the NIO connector, when a client breaks connection unexpectedly
https://issues.apache.org/bugzilla/show_bug.cgi?id=52858 --- Comment #4 from Konstantin Kolinko knst.koli...@gmail.com --- Fixed in 6.0 by r1372035 and will be in 6.0.36. -- 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 53623] Incorrect request properties after AsyncContext.dispatch
https://issues.apache.org/bugzilla/show_bug.cgi?id=53623 --- Comment #1 from Mark Thomas ma...@apache.org --- Thanks for the excellent test case. Very easy to work with. I have the bug in the first scenario fixed. I'll look at the second scenario next. It looks like the bug in the second and fourth scenario are related. I'll commit the fixes once all the scenarios are working. -- 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 53071] ErrorReportValve ignores message from throwable
https://issues.apache.org/bugzilla/show_bug.cgi?id=53071 Konstantin Kolinko knst.koli...@gmail.com changed: What|Removed |Added Status|RESOLVED|REOPENED Component|Catalina|Catalina Version|6.0.35 |7.0.29 Resolution|FIXED |--- Product|Tomcat 6|Tomcat 7 Target Milestone|default |--- --- Comment #13 from Konstantin Kolinko knst.koli...@gmail.com --- Reopening this. This needs further improvement. When there is a java compilation error in JSP page, the error page becomes especially ugly. Reproducible in 7.0.29. To reproduce: 1. Change ROOT/index.jsp introducing a typo in Java code scriptlet, e.g. s/SimpleDateFormat/SimpleDate Format/ 2. Access the page. Actual result: The whole text of the compilation exception, including a source code fragment, is included in the h1 header, as well as in the message field. That is a lot of text without any formatting, occupying the whole screen. It is ugly. Expected result: Maybe include just some part of the text, and replace the rest with ellipsis (...)? Maybe use just the first line, as line breaks are lost when rendering HTML? Also, the changes mentioned in Comment 11 still have to be proposed/fixed in 6.0. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1371995 - in /tomcat/trunk: java/org/apache/catalina/startup/ContextConfig.java test/org/apache/catalina/startup/TestContextConfig.java test/webapp-3.0/WEB-INF/jsp/ test/webapp-3.0/WE
2012/8/11 ma...@apache.org:
Author: markt
Date: Sat Aug 11 18:54:53 2012
New Revision: 1371995
URL: http://svn.apache.org/viewvc?rev=1371995view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53574
Ensure Servlets defined using jsp-file are available when metadata-complete
is true.
Added:
tomcat/trunk/test/webapp-3.0/WEB-INF/jsp/
tomcat/trunk/test/webapp-3.0/WEB-INF/jsp/bug53574.jsp
Modified:
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/test/org/apache/catalina/startup/TestContextConfig.java
tomcat/trunk/test/webapp-3.0/WEB-INF/web.xml
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1371995r1=1371994r2=1371995view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Sat Aug
11 18:54:53 2012
@@ -1245,6 +1245,7 @@ public class ContextConfig implements Li
}
} else {
webXml.merge(defaults);
+convertJsps(webXml);
webXml.configureContext(context);
What about Step 9a. Make the merged web.xml available to other
components, specifically Jasper, (...) from the main
if(!webXml.isMetadataComplete()) branch?
Shouldn't it be invoked in this case as well?
I think it is possible to move the whole step 9 to below the else{}
block, so that it were invoked in either case.
}
Best regards,
Konstantin Kolinko
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1372041 - in /tomcat/trunk/test: org/apache/jasper/runtime/ org/apache/tomcat/unittest/tags/ webapp-3.0/ webapp-3.0/WEB-INF/ webapp-3.0/WEB-INF/jsp/
Author: kkolinko Date: Sun Aug 12 01:05:35 2012 New Revision: 1372041 URL: http://svn.apache.org/viewvc?rev=1372041view=rev Log: Set svn:eol-style=native Modified: tomcat/trunk/test/org/apache/jasper/runtime/TestPageContextImpl.java (props changed) tomcat/trunk/test/org/apache/tomcat/unittest/tags/Bug53545.java (props changed) tomcat/trunk/test/webapp-3.0/WEB-INF/bug53545.tld (props changed) tomcat/trunk/test/webapp-3.0/WEB-INF/jsp/bug53574.jsp (props changed) tomcat/trunk/test/webapp-3.0/bug53545.html (props changed) tomcat/trunk/test/webapp-3.0/bug53545.jsp (props changed) Propchange: tomcat/trunk/test/org/apache/jasper/runtime/TestPageContextImpl.java -- svn:eol-style = native Propchange: tomcat/trunk/test/org/apache/tomcat/unittest/tags/Bug53545.java -- svn:eol-style = native Propchange: tomcat/trunk/test/webapp-3.0/WEB-INF/bug53545.tld -- svn:eol-style = native Propchange: tomcat/trunk/test/webapp-3.0/WEB-INF/jsp/bug53574.jsp -- svn:eol-style = native Propchange: tomcat/trunk/test/webapp-3.0/bug53545.html -- svn:eol-style = native Propchange: tomcat/trunk/test/webapp-3.0/bug53545.jsp -- svn:eol-style = native - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1372042 - in /tomcat/tc7.0.x/trunk/test: org/apache/jasper/runtime/ org/apache/tomcat/unittest/tags/ webapp-3.0/ webapp-3.0/WEB-INF/ webapp-3.0/WEB-INF/jsp/
Author: kkolinko Date: Sun Aug 12 01:10:51 2012 New Revision: 1372042 URL: http://svn.apache.org/viewvc?rev=1372042view=rev Log: Set svn:eol-style=native Modified: tomcat/tc7.0.x/trunk/test/org/apache/jasper/runtime/TestPageContextImpl.java (props changed) tomcat/tc7.0.x/trunk/test/org/apache/tomcat/unittest/tags/Bug53545.java (props changed) tomcat/tc7.0.x/trunk/test/webapp-3.0/WEB-INF/bug53545.tld (props changed) tomcat/tc7.0.x/trunk/test/webapp-3.0/WEB-INF/jsp/bug53574.jsp (props changed) tomcat/tc7.0.x/trunk/test/webapp-3.0/bug53545.html (props changed) tomcat/tc7.0.x/trunk/test/webapp-3.0/bug53545.jsp (props changed) Propchange: tomcat/tc7.0.x/trunk/test/org/apache/jasper/runtime/TestPageContextImpl.java -- svn:eol-style = native Propchange: tomcat/tc7.0.x/trunk/test/org/apache/tomcat/unittest/tags/Bug53545.java -- svn:eol-style = native Propchange: tomcat/tc7.0.x/trunk/test/webapp-3.0/WEB-INF/bug53545.tld -- svn:eol-style = native Propchange: tomcat/tc7.0.x/trunk/test/webapp-3.0/WEB-INF/jsp/bug53574.jsp -- svn:eol-style = native Propchange: tomcat/tc7.0.x/trunk/test/webapp-3.0/bug53545.html -- svn:eol-style = native Propchange: tomcat/tc7.0.x/trunk/test/webapp-3.0/bug53545.jsp -- svn:eol-style = native - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1372044 - in /tomcat/tc7.0.x/trunk/modules/jdbc-pool/src: main/java/org/apache/tomcat/jdbc/pool/ test/java/org/apache/tomcat/jdbc/test/
Author: kkolinko
Date: Sun Aug 12 01:25:23 2012
New Revision: 1372044
URL: http://svn.apache.org/viewvc?rev=1372044view=rev
Log:
Remove unneeded svn:mergeinfo properties
The merge with r1371896 has already been recorded on tomcat/tc7.0.x/trunk/ in
r1371900
The values were
/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool:1371896
/tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test:1371896
Modified:
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/
(props changed)
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/
(props changed)
Propchange:
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/
('svn:mergeinfo' removed)
Propchange:
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/
('svn:mergeinfo' removed)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
