svn commit: r1557990 - in /tomcat/tc6.0.x/trunk: STATUS.txt build.properties.default eclipse.classpath java/org/apache/catalina/startup/TldConfig.java java/org/apache/jasper/compiler/TldLocationsCache
Author: markt
Date: Tue Jan 14 09:20:46 2014
New Revision: 1557990
URL: http://svn.apache.org/r1557990
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55759
Update the Eclipse compiler to 4.3.1
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/build.properties.default
tomcat/tc6.0.x/trunk/eclipse.classpath
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java
tomcat/tc6.0.x/trunk/res/maven/jasper.pom
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=1557990r1=1557989r2=1557990view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jan 14 09:20:46 2014
@@ -32,15 +32,6 @@ PATCHES PROPOSED TO BACKPORT:
[ New proposals should be added at the end of the list ]
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55759
- Update the Eclipse compiler to 4.3.1
-
http://people.apache.org/~markt/patches/2014-01-13-ecj-4.3.1-update-tc6-v1.patch
- +1: markt, remm, mturk
- +0: kkolinko: A Tomcat6-specific patch is needed. It needs update to jar
- exclude lists in TldConfig.java, TldLocationsCache.java, see r1476932.
- markt: Patch updated
- -1:
-
* Back-port some XML processing improvements (part 4)
Add a unit test for the new descriptor
Note I am generating the patches using git so the patch shows whole new files
Modified: tomcat/tc6.0.x/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.properties.default?rev=1557990r1=1557989r2=1557990view=diff
==
--- tomcat/tc6.0.x/trunk/build.properties.default (original)
+++ tomcat/tc6.0.x/trunk/build.properties.default Tue Jan 14 09:20:46 2014
@@ -108,8 +108,8 @@ wsdl4j-lib.jar=${wsdl4j-lib.home}/wsdl4j
# - noTldJars in o.a.j.compiler.TldLocationsCache
# - res/maven/jasper.pom
# - eclipse.classpath
-jdt.version=4.2.2
-jdt.release=R-4.2.2-201302041200
+jdt.version=4.3.1
+jdt.release=R-4.3.1-201309111000
jdt.home=${base.path}/ecj-${jdt.version}
jdt.jar=${jdt.home}/ecj-${jdt.version}.jar
# The download will be moved to the archive area eventually. We are taking
care of that in advance.
Modified: tomcat/tc6.0.x/trunk/eclipse.classpath
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/eclipse.classpath?rev=1557990r1=1557989r2=1557990view=diff
==
--- tomcat/tc6.0.x/trunk/eclipse.classpath (original)
+++ tomcat/tc6.0.x/trunk/eclipse.classpath Tue Jan 14 09:20:46 2014
@@ -20,7 +20,7 @@
classpathentry kind=src path=test/
classpathentry kind=src path=webapps/examples/WEB-INF/classes/
classpathentry kind=con
path=org.eclipse.jdt.launching.JRE_CONTAINER/
- classpathentry kind=var
path=TOMCAT_LIBS_BASE/ecj-4.2.2/ecj-4.2.2.jar/
+ classpathentry kind=var
path=TOMCAT_LIBS_BASE/ecj-4.3.1/ecj-4.3.1.jar/
classpathentry kind=con
path=org.eclipse.jdt.junit.JUNIT_CONTAINER/3/
classpathentry kind=var path=ANT_HOME/lib/ant.jar/
classpathentry kind=output path=.settings/output/
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java?rev=1557990r1=1557989r2=1557990view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java Tue
Jan 14 09:20:46 2014
@@ -92,6 +92,7 @@ public final class TldConfig implements
noTldJars.add(ecj-3.7.2.jar);
noTldJars.add(ecj-4.2.1.jar);
noTldJars.add(ecj-4.2.2.jar);
+noTldJars.add(ecj-4.3.1.jar);
noTldJars.add(jsp-api.jar);
noTldJars.add(servlet-api.jar);
noTldJars.add(tomcat-coyote.jar);
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java?rev=1557990r1=1557989r2=1557990view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java
Tue Jan 14 09:20:46 2014
@@ -133,6 +133,7 @@ public class TldLocationsCache {
noTldJars.add(ecj-3.7.2.jar);
noTldJars.add(ecj-4.2.1.jar);
noTldJars.add(ecj-4.2.2.jar);
+noTldJars.add(ecj-4.3.1.jar);
[Bug 55759] Update to ECJ 4.3.1
https://issues.apache.org/bugzilla/show_bug.cgi?id=55759 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #5 from Mark Thomas ma...@apache.org --- 6.0.x has been updated to ECJ 4.3.1 which will be included in 6.0.38 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
[Bug 55671] Backport genStringAsCharArray patch to Tomcat 6.x branch.
https://issues.apache.org/bugzilla/show_bug.cgi?id=55671 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #4 from Mark Thomas ma...@apache.org --- The proposed patch has been applied to 6.0.x and will be included in 6.0.38 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: r1557994 - in /tomcat/tc6.0.x/trunk: ./ conf/ java/org/apache/jasper/ java/org/apache/jasper/resources/ webapps/docs/
Author: markt
Date: Tue Jan 14 09:35:25 2014
New Revision: 1557994
URL: http://svn.apache.org/r1557994
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55671
s/genStrAsCharArray/genStringAsCharArray/ and retain support for
genStrAsCharArray as an init parameter
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/conf/web.xml
tomcat/tc6.0.x/trunk/java/org/apache/jasper/EmbeddedServletOptions.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/docs/jasper-howto.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1557994r1=1557993r2=1557994view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jan 14 09:35:25 2014
@@ -53,19 +53,6 @@ PATCHES PROPOSED TO BACKPORT:
requires Ant = 1.8.0).
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55671
- Consistent naming for genStringAsCharArray
- https://issues.apache.org/bugzilla/attachment.cgi?id=31187
- +1: markt, remm, mturk
- -0: kkolinko: I think genStrAsCharArray is the proper and
-documented name for Tomcat 6. If we change the init-param name
-for better compatibility with Tomcat 7 (a good thing, +1),
-the code should check both the new and the old param names.
-It also needs r1556725.
-https://issues.apache.org/bugzilla/show_bug.cgi?id=55671#c1
- markt: patch updated
- -1:
-
* Add an option to the Context to control the blocking of XML external entities
when parsing XML configuration files and enable this blocking by default when
a security manager is used. The block is implemented via a custom resolver to
Modified: tomcat/tc6.0.x/trunk/conf/web.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/conf/web.xml?rev=1557994r1=1557993r2=1557994view=diff
==
--- tomcat/tc6.0.x/trunk/conf/web.xml (original)
+++ tomcat/tc6.0.x/trunk/conf/web.xml Tue Jan 14 09:35:25 2014
@@ -196,7 +196,8 @@
!-- a separate JVM is used for JSP page compiles --
!-- from the one Tomcat is running in. [true] --
!-- --
- !-- genStrAsCharArray Should text strings be generated as char --
+ !-- genStringAsCharArray --
+ !-- Should text strings be generated as char --
!-- arrays, to improve performance in some cases? --
!-- [false]--
!-- --
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/jasper/EmbeddedServletOptions.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/EmbeddedServletOptions.java?rev=1557994r1=1557993r2=1557994view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/EmbeddedServletOptions.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/EmbeddedServletOptions.java Tue
Jan 14 09:35:25 2014
@@ -5,9 +5,9 @@
* 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.
@@ -27,199 +27,198 @@ import org.apache.jasper.compiler.TldLoc
import org.apache.jasper.compiler.JspConfig;
import org.apache.jasper.compiler.TagPluginManager;
import org.apache.jasper.compiler.Localizer;
-import org.apache.jasper.xmlparser.ParserUtils;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
/**
- * A class to hold all init parameters specific to the JSP engine.
+ * A class to hold all init parameters specific to the JSP engine.
*
* @author Anil K. Vijendran
* @author Hans Bergsten
* @author Pierre Delisle
*/
public final class EmbeddedServletOptions implements Options {
-
+
// Logger
private Log log = LogFactory.getLog(EmbeddedServletOptions.class);
-
+
private Properties settings = new Properties();
-
+
/**
* Is Jasper being used
JDK 8 Build 123 JDK 7 Update 60 build 02 are available on java.net
Hi Mladen, We haven't heard from you in some time, how is your testing progressing ? Please let me know if you are seeing any issues. JDK 8 Build b123 Early Access Build is now available for download http://jdk8.java.net/download.html test. JDK 7u60 b02 Early Access Build is also available for download https://jdk7.java.net/download.html test. We are now very late in the release cycle of JDK 8 , issues found late may be postponed to JDK 9 time frame. Please log all show stopper issues as soon as possible. Thanks for your support, Rory -- Rgds,Rory O'Donnell Quality Engineering Manager Oracle EMEA , Dublin, Ireland
svn commit: r1558014 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Tue Jan 14 11:27:54 2014 New Revision: 1558014 URL: http://svn.apache.org/r1558014 Log: Proposal Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1558014r1=1558013r2=1558014view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jan 14 11:27:54 2014 @@ -62,6 +62,12 @@ PATCHES PROPOSED TO BACKPORT: +1: markt, mturk -1: +* Ensure that sessions IDs are not parsed from URLs for Contexts where + disableURLRewriting is true. + http://people.apache.org/~markt/patches/2014-01-14-disableURLRewriting-tc6-v1.patch + +1: markt + -1: + PATCHES/ISSUES THAT ARE STALLED - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1558018 - /tomcat/trunk/bin/catalina-tasks.xml
Author: markt
Date: Tue Jan 14 12:04:01 2014
New Revision: 1558018
URL: http://svn.apache.org/r1558018
Log:
Add new JAR
Modified:
tomcat/trunk/bin/catalina-tasks.xml
Modified: tomcat/trunk/bin/catalina-tasks.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina-tasks.xml?rev=1558018r1=1558017r2=1558018view=diff
==
--- tomcat/trunk/bin/catalina-tasks.xml (original)
+++ tomcat/trunk/bin/catalina-tasks.xml Tue Jan 14 12:04:01 2014
@@ -30,6 +30,7 @@
fileset file=${catalina.home}/bin/tomcat-juli.jar/
fileset file=${catalina.home}/lib/tomcat-api.jar/
fileset file=${catalina.home}/lib/tomcat-util.jar/
+ fileset file=${catalina.home}/lib/tomcat-util-scan.jar/
fileset file=${catalina.home}/lib/jasper.jar/
fileset file=${catalina.home}/lib/jasper-el.jar/
fileset file=${catalina.home}/lib/el-api.jar/
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1558019 - /tomcat/trunk/java/org/apache/jasper/compiler/TldCache.java
Author: markt
Date: Tue Jan 14 12:04:41 2014
New Revision: 1558019
URL: http://svn.apache.org/r1558019
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55995
Fix NPE when using JspC and there are JARs containing TLDs on the classpath
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/TldCache.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/TldCache.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/TldCache.java?rev=1558019r1=1558018r2=1558019view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/TldCache.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/TldCache.java Tue Jan 14
12:04:41 2014
@@ -121,14 +121,19 @@ public class TldCache {
result[0] = -1;
result[1] = -1;
try {
-URL url =
servletContext.getResource(tldResourcePath.getWebappPath());
-URLConnection conn = url.openConnection();
-result[0] = conn.getLastModified();
-if (file.equals(url.getProtocol())) {
-// Reading the last modified time opens an input stream so we
-// need to make sure it is closed again otherwise the TLD file
-// will be locked until GC runs.
-conn.getInputStream().close();
+String webappPath = tldResourcePath.getWebappPath();
+if (webappPath != null) {
+// webappPath will be null for JARs containing TLDs that are on
+// the class path but not part of the web application
+URL url =
servletContext.getResource(tldResourcePath.getWebappPath());
+URLConnection conn = url.openConnection();
+result[0] = conn.getLastModified();
+if (file.equals(url.getProtocol())) {
+// Reading the last modified time opens an input stream so
we
+// need to make sure it is closed again otherwise the TLD
file
+// will be locked until GC runs.
+conn.getInputStream().close();
+}
}
Jar jar = tldResourcePath.getJar();
if (jar != null) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55995] java.lang.NullPointerException at org.apache.jasper.servlet.JspCServletContext.getResource(JspCServletContext.java:344)
https://issues.apache.org/bugzilla/show_bug.cgi?id=55995 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEEDINFO|RESOLVED Resolution|--- |FIXED --- Comment #4 from Mark Thomas ma...@apache.org --- Thanks for the test case. The bit I was missing as explicitly putting the JARs containing TLDs on the class path. This has been fixed in 8.0.x and will be included in 8.0.0 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
[Bug 56003] tool-wrapper.bat cannot report failures. because ExceptionUtils class is not on classpath
https://issues.apache.org/bugzilla/show_bug.cgi?id=56003 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED OS||All --- Comment #1 from Mark Thomas ma...@apache.org --- Fixed in 8.0.x for 8.0.0 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: r1558020 - in /tomcat/trunk/bin: tool-wrapper.bat tool-wrapper.sh
Author: markt Date: Tue Jan 14 12:10:07 2014 New Revision: 1558020 URL: http://svn.apache.org/r1558020 Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56003 tool-wrapper.[sh|bat] requires tomcat-util.jar on the class path Modified: tomcat/trunk/bin/tool-wrapper.bat tomcat/trunk/bin/tool-wrapper.sh Modified: tomcat/trunk/bin/tool-wrapper.bat URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/tool-wrapper.bat?rev=1558020r1=1558019r2=1558020view=diff == --- tomcat/trunk/bin/tool-wrapper.bat (original) +++ tomcat/trunk/bin/tool-wrapper.bat Tue Jan 14 12:10:07 2014 @@ -79,7 +79,7 @@ rem quotes into the CLASSPATH if %CLASSPATH% == goto emptyClasspath set CLASSPATH=%CLASSPATH%; :emptyClasspath -set CLASSPATH=%CLASSPATH%%CATALINA_HOME%\bin\bootstrap.jar;%CATALINA_HOME%\bin\tomcat-juli.jar;%CATALINA_HOME%\lib\servlet-api.jar +set CLASSPATH=%CLASSPATH%%CATALINA_HOME%\bin\bootstrap.jar;%CATALINA_HOME%\bin\tomcat-juli.jar;%CATALINA_HOME%\lib\servlet-api.jar;%CATALINA_HOME%\lib\tomcat-util.jar set JAVA_OPTS=%JAVA_OPTS% -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager Modified: tomcat/trunk/bin/tool-wrapper.sh URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/tool-wrapper.sh?rev=1558020r1=1558019r2=1558020view=diff == --- tomcat/trunk/bin/tool-wrapper.sh (original) +++ tomcat/trunk/bin/tool-wrapper.sh Tue Jan 14 12:10:07 2014 @@ -120,7 +120,7 @@ fi if [ ! -z $CLASSPATH ] ; then CLASSPATH=$CLASSPATH: fi -CLASSPATH=$CLASSPATH$CATALINA_HOME/bin/bootstrap.jar:$CATALINA_HOME/bin/tomcat-juli.jar:$CATALINA_HOME/lib/servlet-api.jar +CLASSPATH=$CLASSPATH$CATALINA_HOME/bin/bootstrap.jar:$CATALINA_HOME/bin/tomcat-juli.jar:$CATALINA_HOME/lib/servlet-api.jar:$CATALINA_HOME/lib/tomcat-util.jar # For Cygwin, switch paths to Windows format before running java if $cygwin; then - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55945] Support pre-compressed (gzip) resources with arbitrary file name extensions
https://issues.apache.org/bugzilla/show_bug.cgi?id=55945 Mark Thomas ma...@apache.org changed: What|Removed |Added CC||chris.d...@gmail.com --- Comment #3 from Mark Thomas ma...@apache.org --- *** Bug 55943 has been marked as a duplicate of this bug. *** -- 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 55943] Provide a way prevent looking at the System classloader before the webapp classloaders
https://issues.apache.org/bugzilla/show_bug.cgi?id=55943 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |DUPLICATE --- Comment #4 from Mark Thomas ma...@apache.org --- *** This bug has been marked as a duplicate of bug 55945 *** -- 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 55946] Add sample filter for serving pre-compressed files by merely adding Content-Encoding to response headers
https://issues.apache.org/bugzilla/show_bug.cgi?id=55946 --- Comment #1 from Mark Thomas ma...@apache.org --- *** Bug 55945 has been marked as a duplicate of this bug. *** -- 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 55943] Provide a way prevent looking at the System classloader before the webapp classloaders
https://issues.apache.org/bugzilla/show_bug.cgi?id=55943 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|DUPLICATE |--- --- Comment #5 from Mark Thomas ma...@apache.org --- Sorry - wrong bug. -- 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 55945] Support pre-compressed (gzip) resources with arbitrary file name extensions
https://issues.apache.org/bugzilla/show_bug.cgi?id=55945 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |DUPLICATE --- Comment #4 from Mark Thomas ma...@apache.org --- *** This bug has been marked as a duplicate of bug 55946 *** -- 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 55946] Add sample filter for serving pre-compressed files by merely adding Content-Encoding to response headers
https://issues.apache.org/bugzilla/show_bug.cgi?id=55946 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |WONTFIX --- Comment #2 from Mark Thomas ma...@apache.org --- I don't think there is enough demand for this feature to add an example filter to the distribution. My example filter [1] isn't going anywhere. A better solution might be to create an area on the wiki (I though we already had one but couldn't find it) for sample code like this. -- 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
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/5396 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1558019 Blamelist: markt Build succeeded! sincerely, -The Buildbot
[Bug 55995] java.lang.NullPointerException at org.apache.jasper.servlet.JspCServletContext.getResource(JspCServletContext.java:344)
https://issues.apache.org/bugzilla/show_bug.cgi?id=55995 --- Comment #5 from Peter Lenahan peter_lena...@ibi.com --- Konstantin, Mark, Thank you both for reproducing the problem in a better way and fixing it so fast. Peter -- 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 55946] Add sample filter for serving pre-compressed files by merely adding Content-Encoding to response headers
https://issues.apache.org/bugzilla/show_bug.cgi?id=55946 --- Comment #3 from Christopher Schultz ch...@christopherschultz.net --- Okay. Your filter did have a flaw in it that needed to be corrected. I'll see if I can find a home for it on the Wiki. -- 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 56005] New: ISAPI redirector WEB-INF/META-INF Path Check false positive (#51769 is back)
https://issues.apache.org/bugzilla/show_bug.cgi?id=56005 Bug ID: 56005 Summary: ISAPI redirector WEB-INF/META-INF Path Check false positive (#51769 is back) Product: Tomcat Connectors Version: 1.2.37 Hardware: PC Status: NEW Severity: normal Priority: P2 Component: isapi Assignee: dev@tomcat.apache.org Reporter: ringz...@nym.hush.com All: It looks like the path checking to determin if the ISAPI redirector is serving up something from the WEB-INF or META-INF directories is either broken again, or Ranier's solution from Bug 51769 wasn't committed / carried forward. Personally, I used Chris Schultz's patch on 1.2.32, just upgraded to 1.2.37 and found the problem had returned. Note that this does not necessarily affect mod_jk, I suspect this has more to do with how IIS enumerates path components. Apache sends a relative path to mod_jk on windows which (in my situation) does not include WEB-INF. IIS sends an absolute pathname, which does include WEB-INF in the path to isapi_redirect and isapi_redirect generates a 404 error. For various purposes, I'd like to nominate that a mechanism to disable the default behavior: In handle_notify_event (line 1994) - Add a check before 'if (uri_is_web_inf(uri))' to see if a variable has been set via isapi_redirect.properties that defines whether URI path checking for WEB-INF / META-INF should be done. That way, the server admin can decide whether IIS, Tomcat or the redirector should do path checking (or all three). This will also aid in webapp debugging and backward compatibility. System: Windows Server 2008R2 x64 IIS 7.5 Tomcat 7.0.35 x64 isapi_redirector.dll version 1.2.37 x64 -- 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 56005] ISAPI redirector WEB-INF/META-INF Path Check false positive (#51769 is back)
https://issues.apache.org/bugzilla/show_bug.cgi?id=56005 ringz...@nym.hush.com changed: What|Removed |Added CC||ringz...@nym.hush.com OS||All -- 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: [Taglibs] Extended?
On Jan 13, 2014, at 9:51 PM, Henri Yandell flame...@gmail.com wrote: Any thoughts Jeremy on our containing tags outside of the Standard implementation? I was pondering folding the Extended one (which contains two very tiny tags) into the Standard taglib, or if you don't see any likelihood for adding new ones, just removing it. If anything, I think I would rather go in the other direction, breaking Standard down into individual taglibs. I think there are a number of users who primarily rely only on core fn in their applications, using other libraries for the functionality in fmt, sql, and xml. It would be nice to be able to consume them that way. Splitting them up would also allow specific libraries to be optimized through tag plugins or by Jasper itself. Those other libraries have also not really kept up with the times. For example, fmt is heavily coupled to native Java L10N which I think still lags behind icu4j and hasn’t added basics like named placeholders, sql has been superseded by frameworks like JPA but even the basic JDBC support could take advantage of “new things like @Resource injection, and we’ve added a hard dependency on Xalan to address xml performance and the spec still hasn’t touched new features like XPath 2 or XQuery. “Extended” is a vague name so I would be in favor of just dropping it and replacing it with more specific libraries e.g. localization, xpath, json or whatever we decide to work on. Cheers Jeremy signature.asc Description: Message signed with OpenPGP using GPGMail
Context switch integration
Hi, In Tomcat, entering a context is done simply by setting the context classloader and sometimes firing some random events (like the ones from the ServletRequestListener). This isn't so good for integration and could use improvements, in addition to at least one place where this is not done at all (very recently a bug reported to me that indicated there was an issue with SSO session expiration, and indeed it expires sessions from other contexts just like that). So I would propose harmonizing this (and fix the SSO issue too, obviously), with a new dedicated ThreadBindingListener interface (two methods: bind/unbind) and a get/set for it also in Context, to be used for integration. Although usually generic listeners are used (and there can be multiple ones), this has worked well for me so far. Ideally I would have liked to also take over the privileged actions in a utility class, but this would make PA use less optimal (for example in the request dispatcher). Comments ? (or better ideas ?) Rémy
svn commit: r1558129 - /tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapper.java
Author: markt
Date: Tue Jan 14 17:58:45 2014
New Revision: 1558129
URL: http://svn.apache.org/r1558129
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55996
Ensure Async requests timeout correctly.
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=1558129r1=1558128r2=1558129view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapper.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapper.java Tue Jan 14
17:58:45 2014
@@ -85,7 +85,15 @@ public class SocketWrapperE {
public boolean isSecure() { return secure; }
public void setSecure(boolean secure) { this.secure = secure; }
public long getLastAccess() { return lastAccess; }
-public void access() { access(System.currentTimeMillis()); }
+public void access() {
+// Async timeouts are based on the time between the call to
startAsync()
+// and complete() / dispatch() so don't update the last access time
+// (that drives the timeout) on every read and write when using async
+// processing.
+if (!isAsync()) {
+access(System.currentTimeMillis());
+}
+}
public void access(long access) { lastAccess = access; }
public void setTimeout(long timeout) {this.timeout = timeout;}
public long getTimeout() {return this.timeout;}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1558173 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/net/SocketWrapper.java webapps/docs/changelog.xml
Author: markt
Date: Tue Jan 14 19:18:30 2014
New Revision: 1558173
URL: http://svn.apache.org/r1558173
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55996
Ensure Async requests timeout correctly.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/SocketWrapper.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1558129
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/SocketWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/SocketWrapper.java?rev=1558173r1=1558172r2=1558173view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/SocketWrapper.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/SocketWrapper.java Tue
Jan 14 19:18:30 2014
@@ -73,7 +73,15 @@ public class SocketWrapperE {
public boolean isSecure() { return secure; }
public void setSecure(boolean secure) { this.secure = secure; }
public long getLastAccess() { return lastAccess; }
-public void access() { access(System.currentTimeMillis()); }
+public void access() {
+// Async timeouts are based on the time between the call to
startAsync()
+// and complete() / dispatch() so don't update the last access time
+// (that drives the timeout) on every read and write when using async
+// processing.
+if (!isAsync()) {
+access(System.currentTimeMillis());
+}
+}
public void access(long access) { lastAccess = access; }
public void setTimeout(long timeout) {this.timeout = timeout;}
public long getTimeout() {return this.timeout;}
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=1558173r1=1558172r2=1558173view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Jan 14 19:18:30 2014
@@ -86,6 +86,10 @@
bug55976/bug: Fix sendfile support for the HTTP NIO connector.
(markt)
/fix
+ fix
+bug55996/bug: Ensure Async requests timeout correctly when using
the
+NIO HTTP connector. (markt)
+ /fix
/changelog
/subsection
subsection name=Jasper
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55996] Async context does not timeout with HTTP NIO connector
https://issues.apache.org/bugzilla/show_bug.cgi?id=55996 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #2 from Mark Thomas ma...@apache.org --- This has been fixed in 8.0.x for 8.0.0 and in 7.0.x for 7.0.51. -- 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: r1555177 - in /tomcat/taglibs: extended/trunk/ rdc/trunk/ rdc/trunk/taglibs-rdc-dist/ rdc/trunk/taglibs-rdc-examples/ rdc/trunk/taglibs-rdc/ site/ standard/trunk/ taglibs-parent/trunk/
On Tue, Jan 14, 2014 at 12:49 AM, Henri Yandell flame...@gmail.com wrote: On Sun, Jan 12, 2014 at 9:16 PM, Henri Yandell flame...@gmail.com wrote: My main concern is it makes inactive codebases seem alive. ie) extended looks as though there's been code change in the last 5 years instead of only having had code in it in 2009. Similar with RDC. On this topic, I've pinged Rahul offline to get his thoughts on retiring RDC to the Attic. I'm assuming he's not tracking the dev list. snip/ I'm here, but no dev cycles for RDC at the moment or in the near future. So, attic sounds right. -Rahul Hen - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56010] New: JspFactory.getPageContext with JspWriter.DEFAULT_BUFFER throws IllegalArgumentException
https://issues.apache.org/bugzilla/show_bug.cgi?id=56010 Bug ID: 56010 Summary: JspFactory.getPageContext with JspWriter.DEFAULT_BUFFER throws IllegalArgumentException Product: Tomcat 7 Version: trunk Hardware: PC OS: Linux Status: NEW Severity: normal Priority: P2 Component: Jasper Assignee: dev@tomcat.apache.org Reporter: bluewolf.ch...@gmail.com When a servlet calls JspFactory.getPageContext() with JspWriter.DEFAULT_BUFFER, Tomcat Japser throws IllegalArgumentException. PageContext pageContext = JspFactory.getDefaultFactory().getPageContext(this, req, resp, null, false, JspWriter.DEFAULT_BUFFER, true); java.lang.IllegalArgumentException: Buffer size = 0 org.apache.jasper.runtime.JspWriterImpl.init(JspWriterImpl.java:81) org.apache.jasper.runtime.PageContextImpl._initialize(PageContextImpl.java:154) org.apache.jasper.runtime.PageContextImpl.initialize(PageContextImpl.java:125) org.apache.jasper.runtime.JspFactoryImpl.internalGetPageContext(JspFactoryImpl.java:112) org.apache.jasper.runtime.JspFactoryImpl.getPageContext(JspFactoryImpl.java:65) dvt.jsp.jaspertest.JspFactoryTestServlet.doGet(JspFactoryTestServlet.java:21) javax.servlet.http.HttpServlet.service(HttpServlet.java:621) javax.servlet.http.HttpServlet.service(HttpServlet.java:728) Based on the description of JspFactory.getPageContext(), if buffer size is JspWriter.DEFAULT_BUFFER(-1), PageContext must treat it as implementation default, which in case is org.apache.jasper.Constants#DEFAULT_BUFFER_SIZE(8192). buffer - size of buffer in bytes, JspWriter.NO_BUFFER if no buffer, JspWriter.DEFAULT_BUFFER if implementation default. from http://docs.oracle.com/javaee/7/api/javax/servlet/jsp/JspFactory.html#getPageContext(javax.servlet.Servlet, javax.servlet.ServletRequest, javax.servlet.ServletResponse, java.lang.String, boolean, int, boolean) Note that -Dorg.apache.jasper.runtime.JspFactoryImpl.USE_POOL=false should be specified. -- 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 56010] JspFactory.getPageContext with JspWriter.DEFAULT_BUFFER throws IllegalArgumentException
https://issues.apache.org/bugzilla/show_bug.cgi?id=56010
--- Comment #1 from Eugene Chung (TmaxSoft) bluewolf.ch...@gmail.com ---
Created attachment 31206
-- https://issues.apache.org/bugzilla/attachment.cgi?id=31206action=edit
Test Source
I suggest that org.apache.jasper.runtime.PageContextImpl needs to check if
buffer size is JspWriter.DEFAULT_BUFFER and adjust it to default.
org.apache.jasper.runtime.PageContextImpl#initialize(..)
if (bufferSize == JspWriter.DEFAULT_BUFFER) {
bufferSize = Constants.DEFAULT_BUFFER_SIZE;
}
if (this.baseOut == null) {
this.baseOut = new JspWriterImpl(response, bufferSize, autoFlush);
} else {
this.baseOut.init(response, bufferSize, autoFlush);
}
--
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 56012] New: wrong import statement generation while using the extends attribute of the page directive
https://issues.apache.org/bugzilla/show_bug.cgi?id=56012
Bug ID: 56012
Summary: wrong import statement generation while using the
extends attribute of the page directive
Product: Tomcat 7
Version: trunk
Hardware: PC
OS: Linux
Status: NEW
Severity: normal
Priority: P2
Component: Jasper
Assignee: dev@tomcat.apache.org
Reporter: bluewolf.ch...@gmail.com
Here is the test example, extends.jsp,
%@ page import=dvt.jsp.jaspertest.* %
%@ page extends=TestJspBase %
%
out.println(TEST);
%
and its TestJspBase.java.
package dvt.jsp.jaspertest;
import jeus.servlet.jsp.HttpJspBase;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
public class TestJspBase extends HttpJspBase {
@Override
public void _jspService(HttpServletRequest request, HttpServletResponse
response) throws ServletException, IOException {
/* do nothing here */
}
}
I know that the fully qualified class name must be used while using the extends
attribute of the page directive. But the java generator of jasper has also a
problem.
/*
* Generated by the Jasper component of Apache Tomcat
* Version: Apache Tomcat/7.0.50
* Generated at: 2014-01-15 04:56:28 UTC
* Note: The last modified time of this file was set to
* the last modified time of the source file after
* generation to assist with modification tracking.
*/
package org.apache.jsp;
import javax.servlet.*;
import javax.servlet.http.*;
import javax.servlet.jsp.*;
import dvt.jsp.jaspertest.*;
import TestJspBase;
public final class extends_jsp extends TestJspBase
implements org.apache.jasper.runtime.JspSourceDependent {
The problem is 'import TestJspBase;'.
The java language spec. does not allow the class name of default package.
http://docs.oracle.com/javase/specs/jls/se5.0/html/packages.html#70209
In my opinion, no import statement generation would be best for the simple
class name.
org.apache.jasper.compiler.PageInfo
public void setExtends(String value, Node.PageDirective n) {
xtends = value;
}
FYI, there was a time that such import statement was possible to use until it
was fixed at JDK 1.4.
http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4361575
--
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 56012] wrong import statement generation while using the extends attribute of the page directive
https://issues.apache.org/bugzilla/show_bug.cgi?id=56012 Eugene Chung (TmaxSoft) bluewolf.ch...@gmail.com changed: What|Removed |Added CC||howeverk...@gmail.com -- 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 56012] wrong import statement generation while using the extends attribute of the page directive
https://issues.apache.org/bugzilla/show_bug.cgi?id=56012 --- Comment #1 from Eugene Chung (TmaxSoft) bluewolf.ch...@gmail.com --- It is a compile time error to import a type from the unnamed package. (from http://docs.oracle.com/javase/specs/jls/se5.0/html/packages.html#70209) -- 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
