[Bug 56415] EXCEPTION_ACCESS_VIOLATION (0xc0000005) in tcnative-1.dll
https://issues.apache.org/bugzilla/show_bug.cgi?id=56415 Martin Hanus martin.ha...@ysoft.com changed: What|Removed |Added Version|unspecified |1.1.29 --- Comment #2 from Martin Hanus martin.ha...@ysoft.com --- (In reply to Christopher Schultz from comment #1) Is use of tcnative important for you? You could switch to the NIO connector which won't crash your JVM. It appears that you are on Windows, yes? What version of tcnative are you using? Tomcat 7.0.47 ships with 1.1.29. tcnative 1.1.30 is newly available and not vulnerable to Heartbleed as well. Could you test with 1.1.30? We are running on Windows Server 2008 R2 Standard. We really don't case whether we use tcnative or NIO Connector. Important thing is that it's working. Does usage of NIO Connector over tcnative have any noticable performance hit that we should be aware of? We put quite a load on Infinispan REST server deployed inside Tomcat. We are using tcnative which ships in default Tomcat 7.0.47 package. We didn't changed/upgraded any Tomcat dependency. Therefore, we use Tomcat tcnative 1.1.29. -- 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 56415] EXCEPTION_ACCESS_VIOLATION (0xc0000005) in tcnative-1.dll
https://issues.apache.org/bugzilla/show_bug.cgi?id=56415 Martin Hanus martin.ha...@ysoft.com changed: What|Removed |Added OS|All |Windows Server 2008 R2 -- 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 56415] EXCEPTION_ACCESS_VIOLATION (0xc0000005) in tcnative-1.dll
https://issues.apache.org/bugzilla/show_bug.cgi?id=56415 Martin Hanus martin.ha...@ysoft.com changed: What|Removed |Added OS||Windows Server 2008 R2 -- 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 56415] EXCEPTION_ACCESS_VIOLATION (0xc0000005) in tcnative-1.dll
https://issues.apache.org/bugzilla/show_bug.cgi?id=56415 Martin Hanus martin.ha...@ysoft.com changed: What|Removed |Added OS||Windows Server 2008 R2 -- 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 56415] EXCEPTION_ACCESS_VIOLATION (0xc0000005) in tcnative-1.dll
https://issues.apache.org/bugzilla/show_bug.cgi?id=56415 Martin Hanus martin.ha...@ysoft.com changed: What|Removed |Added Status|NEEDINFO|NEW OS||Windows Server 2008 R2 -- 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 56415] EXCEPTION_ACCESS_VIOLATION (0xc0000005) in tcnative-1.dll
https://issues.apache.org/bugzilla/show_bug.cgi?id=56415 Martin Hanus martin.ha...@ysoft.com changed: What|Removed |Added OS||Windows Server 2008 R2 -- 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-trunk-validate (in module tomcat-trunk) 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-trunk-validate has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-validate : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on checkstyle exists, no need to add for property checkstyle.jar. -INFO- Failed with reason build failed The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/gump_work/build_tomcat-trunk_tomcat-trunk-validate.html Work Name: build_tomcat-trunk_tomcat-trunk-validate (Type: Build) Work ended in a state of : Failed Elapsed: 26 secs Command Line: /usr/lib/jvm/java-7-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-5.7-SNAPSHOT.jar -Dexecute.validate=true validate [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-7-oracle/lib/tools.jar:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/checkstyle/target/checkstyle-5.7-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-20140417.jar:/srv/gump/public/workspace/apache-commons/cli/target/commons-cli-1.3-SNAPSHOT.jar:/srv/gump/public/workspace/commons-collections-3.x/target/commons-collections-3.3-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/exec/tar get/commons-exec-1.3-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-20140417.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20140417.jar:/srv/gump/public/workspace/apache-commons/validator/dist/commons-validator-20140417.jar:/srv/gump/public/workspace/google-guava/guava/target/guava-17.0-SNAPSHOT.jar:/srv/gump/packages/javamail-1.4/mail.jar:/srv/gump/packages/javamail-1.4/lib/mailapi.jar:/srv/gump/packages/jaf-1.1ea/activation.jar - Buildfile: /srv/gump/public/workspace/tomcat-trunk/build.xml build-prepare: [delete] Deleting directory /srv/gump/public/workspace/tomcat-trunk/output/build/temp [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/build/temp compile-prepare: download-validate: proxyflags: setproxy: testexist: [echo] Testing for /srv/gump/public/workspace/checkstyle/target/checkstyle-5.7-SNAPSHOT.jar downloadzip: validate: [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/res/checkstyle [checkstyle] Running Checkstyle 5.7-SNAPSHOT on 2776 files [checkstyle] /srv/gump/public/workspace/tomcat-trunk/webapps/docs/changelog.xml:108: Line matches the illegal pattern '\s+$'. BUILD FAILED /srv/gump/public/workspace/tomcat-trunk/build.xml:539: Got 1 errors and 0 warnings. Total time: 26 seconds - To subscribe to this information via syndicated feeds: - RSS: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/rss.xml - Atom: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/atom.xml == Gump Tracking Only === Produced by Apache Gump(TM) version 2.3. Gump Run 20140417060004, vmgump.apache.org:vmgump:20140417060004 Gump E-mail Identifier (unique within run) #3. -- Apache Gump http://gump.apache.org/ [Instance: vmgump] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1588184 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Thu Apr 17 09:20:27 2014 New Revision: 1588184 URL: http://svn.apache.org/r1588184 Log: Votes Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1588184r1=1588183r2=1588184view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Apr 17 09:20:27 2014 @@ -87,7 +87,7 @@ PATCHES PROPOSED TO BACKPORT: - Print a warning in case if neither server nor client jvm is found. https://people.apache.org/~kkolinko/patches/2014-04-14_tc6_56143_v2.patch - +1: kkolinko + +1: kkolinko, markt -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56369 @@ -96,7 +96,7 @@ PATCHES PROPOSED TO BACKPORT: listener. http://svn.apache.org/r1586897 http://svn.apache.org/r1586960 - +1: kkolinko + +1: kkolinko, markt -1: * Back-port patch to allow different kinds of FIPS configuration. @@ -104,7 +104,7 @@ PATCHES PROPOSED TO BACKPORT: http://svn.apache.org/viewvc?view=revisionrevision=r1587379 http://svn.apache.org/viewvc?view=revisionamp;revision=r1587723 (adapt) (Note: requires tcnative 1.1.30) - +1: schultz + +1: schultz, 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: r1588185 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Thu Apr 17 09:20:54 2014 New Revision: 1588185 URL: http://svn.apache.org/r1588185 Log: Update 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=1588185r1=1588184r2=1588185view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Apr 17 09:20:54 2014 @@ -40,7 +40,7 @@ PATCHES PROPOSED TO BACKPORT: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56334 Correct double unescaping - http://people.apache.org/~markt/patches/2014-04-12-attribute-escaping-tc6-v1.patch + http://people.apache.org/~markt/patches/2014-04-17-attribute-escaping-tc6-v2.patch +1: markt -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Tagging 6.0.x
All, I think we are getting close to being able to tag the next 6.0.x release. There are a few things I still need to check/review before the tag but there are a number of patches in the status file ready for review. Any time you can afford to spend on reviewing those patches would be much appreciated. Cheers, Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1588187 - /tomcat/trunk/webapps/docs/changelog.xml
Author: markt Date: Thu Apr 17 09:24:38 2014 New Revision: 1588187 URL: http://svn.apache.org/r1588187 Log: Whitespace police Modified: tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1588187r1=1588186r2=1588187view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Thu Apr 17 09:24:38 2014 @@ -105,7 +105,7 @@ fix bug56390/bug: Fix JAR locking issue with JARs containing TLDs and the TLD cache that prevented the undeployment of web applications when -the WAR was deleted. (markt) +the WAR was deleted. (markt) /fix /changelog /subsection - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1588193 - in /tomcat/trunk/java/org/apache/catalina: security/SecurityClassLoad.java servlets/DefaultServlet.java
Author: markt
Date: Thu Apr 17 09:56:26 2014
New Revision: 1588193
URL: http://svn.apache.org/r1588193
Log:
Small optimisation. The resolver and the factory are only used when running
under a security manager so only load them in this case.
Also avoid a possible memory leak when creating these objects.
Modified:
tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
Modified: tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java?rev=1588193r1=1588192r2=1588193view=diff
==
--- tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java Thu
Apr 17 09:56:26 2014
@@ -43,6 +43,7 @@ public final class SecurityClassLoad {
loadCoyotePackage(loader);
loadLoaderPackage(loader);
loadRealmPackage(loader);
+loadServletsPackage(loader);
loadSessionPackage(loader);
loadUtilPackage(loader);
loadValvesPackage(loader);
@@ -126,6 +127,18 @@ public final class SecurityClassLoad {
}
+private static final void loadServletsPackage(ClassLoader loader)
+throws Exception {
+final String basePackage = org.apache.catalina.servlets.;
+// Avoid a possible memory leak in the DefaultServlet when running with
+// a security manager. The DefaultServlet needs to load an XML parser
+// when running under a security manager. We want this to be loaded by
+// the container rather than a web application to prevent a memory leak
+// via web application class loader.
+loader.loadClass(basePackage + DefaultServlet);
+}
+
+
private static final void loadSessionPackage(ClassLoader loader)
throws Exception {
final String basePackage = org.apache.catalina.session.;
Modified: tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=1588193r1=1588192r2=1588193view=diff
==
--- tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java Thu Apr
17 09:56:26 2014
@@ -132,8 +132,7 @@ public class DefaultServlet extends Http
private static final DocumentBuilderFactory factory;
-private static final SecureEntityResolver secureEntityResolver =
-new SecureEntityResolver();
+private static final SecureEntityResolver secureEntityResolver;
/**
* Full range marker.
@@ -166,9 +165,15 @@ public class DefaultServlet extends Http
urlEncoder.addSafeCharacter('*');
urlEncoder.addSafeCharacter('/');
-factory = DocumentBuilderFactory.newInstance();
-factory.setNamespaceAware(true);
-factory.setValidating(false);
+if (Globals.IS_SECURITY_ENABLED) {
+factory = DocumentBuilderFactory.newInstance();
+factory.setNamespaceAware(true);
+factory.setValidating(false);
+secureEntityResolver = new SecureEntityResolver();
+} else {
+factory = null;
+secureEntityResolver = null;
+}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1588195 - in /tomcat: native/trunk/xdocs/images/docs-stylesheet.css site/trunk/docs/stylesheets/tomcat.css site/trunk/xdocs/stylesheets/tomcat.css trunk/webapps/docs/images/docs-styleshee
Author: kpreisser
Date: Thu Apr 17 09:59:00 2014
New Revision: 1588195
URL: http://svn.apache.org/r1588195
Log:
Ensure th elements have the same text-align property on every browser.
Modified:
tomcat/native/trunk/xdocs/images/docs-stylesheet.css
tomcat/site/trunk/docs/stylesheets/tomcat.css
tomcat/site/trunk/xdocs/stylesheets/tomcat.css
tomcat/trunk/webapps/docs/images/docs-stylesheet.css
Modified: tomcat/native/trunk/xdocs/images/docs-stylesheet.css
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/images/docs-stylesheet.css?rev=1588195r1=1588194r2=1588195view=diff
==
--- tomcat/native/trunk/xdocs/images/docs-stylesheet.css (original)
+++ tomcat/native/trunk/xdocs/images/docs-stylesheet.css Thu Apr 17 09:59:00
2014
@@ -45,6 +45,10 @@ table *:not(table) {
border-collapse: separate;
}
+th {
+ text-align: left;
+}
+
main {
/* Remove this once all IEs support main element */
display: block;
Modified: tomcat/site/trunk/docs/stylesheets/tomcat.css
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/stylesheets/tomcat.css?rev=1588195r1=1588194r2=1588195view=diff
==
--- tomcat/site/trunk/docs/stylesheets/tomcat.css (original)
+++ tomcat/site/trunk/docs/stylesheets/tomcat.css Thu Apr 17 09:59:00 2014
@@ -50,6 +50,10 @@ table *:not(table) {
border-collapse: separate;
}
+th {
+ text-align: left;
+}
+
main {
/* Remove this once all IEs support main element */
display: block;
Modified: tomcat/site/trunk/xdocs/stylesheets/tomcat.css
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/stylesheets/tomcat.css?rev=1588195r1=1588194r2=1588195view=diff
==
--- tomcat/site/trunk/xdocs/stylesheets/tomcat.css (original)
+++ tomcat/site/trunk/xdocs/stylesheets/tomcat.css Thu Apr 17 09:59:00 2014
@@ -50,6 +50,10 @@ table *:not(table) {
border-collapse: separate;
}
+th {
+ text-align: left;
+}
+
main {
/* Remove this once all IEs support main element */
display: block;
Modified: tomcat/trunk/webapps/docs/images/docs-stylesheet.css
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/images/docs-stylesheet.css?rev=1588195r1=1588194r2=1588195view=diff
==
--- tomcat/trunk/webapps/docs/images/docs-stylesheet.css (original)
+++ tomcat/trunk/webapps/docs/images/docs-stylesheet.css Thu Apr 17 09:59:00
2014
@@ -51,6 +51,10 @@ table *:not(table) {
border-collapse: separate;
}
+th {
+ text-align: left;
+}
+
main {
/* Remove this once all IEs support main element */
display: block;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1588197 - /tomcat/trunk/webapps/docs/changelog.xml
Author: markt Date: Thu Apr 17 10:01:35 2014 New Revision: 1588197 URL: http://svn.apache.org/r1588197 Log: Update changelog Modified: tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1588197r1=1588196r2=1588197view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Thu Apr 17 10:01:35 2014 @@ -107,6 +107,10 @@ the TLD cache that prevented the undeployment of web applications when the WAR was deleted. (markt) /fix + fix +Only create XML parsing objects if required and fix associated potential +memory leak in the default Servlet. (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: r1588199 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/security/SecurityClassLoad.java java/org/apache/catalina/servlets/DefaultServlet.java webapps/docs/changelog.xml
Author: markt
Date: Thu Apr 17 10:04:21 2014
New Revision: 1588199
URL: http://svn.apache.org/r1588199
Log:
Small optimisation. The resolver and the factory are only used when running
under a security manager so only load them in this case.
Also avoid a possible memory leak when creating these objects.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1588193,1588197
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java?rev=1588199r1=1588198r2=1588199view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
Thu Apr 17 10:04:21 2014
@@ -39,6 +39,7 @@ public final class SecurityClassLoad {
loadCoyotePackage(loader);
loadLoaderPackage(loader);
loadRealmPackage(loader);
+loadServletsPackage(loader);
loadSessionPackage(loader);
loadUtilPackage(loader);
loadValvesPackage(loader);
@@ -122,6 +123,18 @@ public final class SecurityClassLoad {
}
+private static final void loadServletsPackage(ClassLoader loader)
+throws Exception {
+final String basePackage = org.apache.catalina.servlets.;
+// Avoid a possible memory leak in the DefaultServlet when running with
+// a security manager. The DefaultServlet needs to load an XML parser
+// when running under a security manager. We want this to be loaded by
+// the container rather than a web application to prevent a memory leak
+// via web application class loader.
+loader.loadClass(basePackage + DefaultServlet);
+}
+
+
private static final void loadSessionPackage(ClassLoader loader)
throws Exception {
final String basePackage = org.apache.catalina.session.;
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=1588199r1=1588198r2=1588199view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
Thu Apr 17 10:04:21 2014
@@ -129,8 +129,7 @@ public class DefaultServlet
private static final DocumentBuilderFactory factory;
-private static final SecureEntityResolver secureEntityResolver =
-new SecureEntityResolver();
+private static final SecureEntityResolver secureEntityResolver;
// - Instance Variables
@@ -238,9 +237,15 @@ public class DefaultServlet
urlEncoder.addSafeCharacter('*');
urlEncoder.addSafeCharacter('/');
-factory = DocumentBuilderFactory.newInstance();
-factory.setNamespaceAware(true);
-factory.setValidating(false);
+if (Globals.IS_SECURITY_ENABLED) {
+factory = DocumentBuilderFactory.newInstance();
+factory.setNamespaceAware(true);
+factory.setValidating(false);
+secureEntityResolver = new SecureEntityResolver();
+} else {
+factory = null;
+secureEntityResolver = null;
+}
}
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1588199r1=1588198r2=1588199view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Apr 17 10:04:21 2014
@@ -87,6 +87,10 @@
reverts all the operations performed when adding an MBean notification
listener. (markt)
/fix
+ fix
+Only create XML parsing objects if required and fix associated
potential
+memory leak in the default Servlet. (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
svn commit: r1588200 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Thu Apr 17 10:05:22 2014 New Revision: 1588200 URL: http://svn.apache.org/r1588200 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=1588200r1=1588199r2=1588200view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Apr 17 10:05:22 2014 @@ -107,6 +107,12 @@ PATCHES PROPOSED TO BACKPORT: +1: schultz, markt -1: +* Avoid memory leak and add small optimisation to default Servlet + http://svn.apache.org/r1588199 + +1: markt + -1: + + PATCHES/ISSUES THAT ARE STALLED: None - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56382] Add logging of deployment time
https://issues.apache.org/bugzilla/show_bug.cgi?id=56382 --- Comment #6 from Danila Galimov b...@mail.ru --- Is it ok now? -- 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 56318] Oracle DB cursors are leaking when using org.apache.tomcat.jdbc.pool.DataSourceFactory
https://issues.apache.org/bugzilla/show_bug.cgi?id=56318 --- Comment #16 from Danila Galimov b...@mail.ru --- Is it ok to apply 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
[Bug 56415] EXCEPTION_ACCESS_VIOLATION (0xc0000005) in tcnative-1.dll
https://issues.apache.org/bugzilla/show_bug.cgi?id=56415 Martin Hanus martin.ha...@ysoft.com changed: What|Removed |Added OS||Windows Server 2008 R2 -- 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 56409] A file called \ causes StackOverflowError in tldScanResourcePaths during startup
https://issues.apache.org/bugzilla/show_bug.cgi?id=56409 --- Comment #1 from Mark Thomas ma...@apache.org --- For the record a similar issues exists in Tomcat 8. I'll take a look... -- 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 56423] New: Implement fipsModeGet method stub in case TCN is compiled without OpenSSL
https://issues.apache.org/bugzilla/show_bug.cgi?id=56423 Bug ID: 56423 Summary: Implement fipsModeGet method stub in case TCN is compiled without OpenSSL Product: Tomcat Native Version: 1.1.30 Hardware: PC Status: NEW Severity: normal Priority: P2 Component: Library Assignee: dev@tomcat.apache.org Reporter: knst.koli...@gmail.com In native/src/ssl.c there is #else part, where each of java methods is implemented as a stub. That is for the case when the library is compiled without OpenSSL. There is no stub for the new fipsModeGet method. -- 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 56423] Implement fipsModeGet method stub in case TCN is compiled without OpenSSL
https://issues.apache.org/bugzilla/show_bug.cgi?id=56423 --- Comment #1 from Konstantin Kolinko knst.koli...@gmail.com --- Created attachment 31537 -- https://issues.apache.org/bugzilla/attachment.cgi?id=31537action=edit 2014-04-17_tcn_56423_fipsModeStub.patch A patch that a) implements fipsModeGet b) changes fipsModeSet to throw an exception (There exist other stub methods that throw exceptions: see TCN_IMPLEMENT_CALL(jint, SSL, initialize)) The patch is untested. -- 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
CI
Hi, I'm a bit confused about the infra for CI. - ci.apache.org seems down - http://vmgump.apache.org/gump/public/tomcat-trunk/ does mostly the same, isn't down but apparently doesn't have a build status history; also it has a tomcat-trunk-test-nio2http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio2/index.htmlwhich was added by someone Thanks, Rémy
Re: CI
Hi, There are failed disks with BuildBot's master server (hostname: aegis). pctony (infra guy) said that they have ordered new ones and they will replace them today (US time ?!). Martin Grigorov Wicket Training and Consulting On Thu, Apr 17, 2014 at 3:37 PM, Rémy Maucherat r...@apache.org wrote: Hi, I'm a bit confused about the infra for CI. - ci.apache.org seems down - http://vmgump.apache.org/gump/public/tomcat-trunk/ does mostly the same, isn't down but apparently doesn't have a build status history; also it has a tomcat-trunk-test-nio2 http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio2/index.html which was added by someone Thanks, Rémy
svn commit: r1588248 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Thu Apr 17 13:43:05 2014 New Revision: 1588248 URL: http://svn.apache.org/r1588248 Log: votes Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1588248r1=1588247r2=1588248view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Apr 17 13:43:05 2014 @@ -105,11 +105,20 @@ PATCHES PROPOSED TO BACKPORT: http://svn.apache.org/viewvc?view=revisionamp;revision=r1587723 (adapt) (Note: requires tcnative 1.1.30) +1: schultz, markt + +0: kkolinko: + a) It needs backport of r1588102 as an Exception is thrown by native code + + b) enterFipsMode = 1 != fipsModeState; code and comment before it are wrong. + + FIPS_mode() function of OpenSSL is documented to return non-zero + value when in FIPS mode. You cannot expect it to be '1'. + Reference: + http://wiki.openssl.org/index.php/FIPS_mode%28%29 -1: * Avoid memory leak and add small optimisation to default Servlet http://svn.apache.org/r1588199 - +1: markt + +1: markt, kkolinko -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1588269 - in /tomcat/trunk: java/org/apache/jasper/util/ExceptionUtils.java java/org/apache/tomcat/util/ExceptionUtils.java webapps/docs/changelog.xml
Author: markt
Date: Thu Apr 17 14:35:17 2014
New Revision: 1588269
URL: http://svn.apache.org/r1588269
Log:
Modify generic exception handling so that StackOverflowError is not treated as
a fatal error and can handled and/or logged as required.
Modified:
tomcat/trunk/java/org/apache/jasper/util/ExceptionUtils.java
tomcat/trunk/java/org/apache/tomcat/util/ExceptionUtils.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/jasper/util/ExceptionUtils.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/util/ExceptionUtils.java?rev=1588269r1=1588268r2=1588269view=diff
==
--- tomcat/trunk/java/org/apache/jasper/util/ExceptionUtils.java (original)
+++ tomcat/trunk/java/org/apache/jasper/util/ExceptionUtils.java Thu Apr 17
14:35:17 2014
@@ -33,6 +33,10 @@ public class ExceptionUtils {
if (t instanceof ThreadDeath) {
throw (ThreadDeath) t;
}
+if (t instanceof StackOverflowError) {
+// Swallow silently - it should be recoverable
+return;
+}
if (t instanceof VirtualMachineError) {
throw (VirtualMachineError) t;
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/ExceptionUtils.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/ExceptionUtils.java?rev=1588269r1=1588268r2=1588269view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/ExceptionUtils.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/ExceptionUtils.java Thu Apr 17
14:35:17 2014
@@ -33,6 +33,10 @@ public class ExceptionUtils {
if (t instanceof ThreadDeath) {
throw (ThreadDeath) t;
}
+if (t instanceof StackOverflowError) {
+// Swallow silently - it should be recoverable
+return;
+}
if (t instanceof VirtualMachineError) {
throw (VirtualMachineError) t;
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1588269r1=1588268r2=1588269view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Apr 17 14:35:17 2014
@@ -111,6 +111,11 @@
Only create XML parsing objects if required and fix associated
potential
memory leak in the default Servlet. (markt)
/fix
+ fix
+Modify generic exception handling so that
+codeStackOverflowError/code is not treated as a fatal error and can
+handled and/or logged as required. (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: r1588272 - in /tomcat/trunk: java/org/apache/catalina/webresources/StandardRoot.java webapps/docs/changelog.xml
Author: markt
Date: Thu Apr 17 15:01:07 2014
New Revision: 1588272
URL: http://svn.apache.org/r1588272
Log:
Avoid StackOverflowError on non-Windows systems if a file named '\' is
encountered when scanning for TLDs.
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java?rev=1588272r1=1588271r2=1588272view=diff
==
--- tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java Thu
Apr 17 15:01:07 2014
@@ -238,7 +238,16 @@ public class StandardRoot extends Lifecy
sm.getString(standardRoot.invalidPath, path));
}
-String result = RequestUtil.normalize(path);
+String result;
+if (File.separatorChar == '\\') {
+// On Windows '\\' is a separator so in case a Windows style
+// separator has managed to make it into the path, replace it.
+result = RequestUtil.normalize(path, true);
+} else {
+// On UNIX and similar systems, '\\' is a valid file name so do not
+// convert it to '/'
+result = RequestUtil.normalize(path, false);
+}
if (result == null || result.length() == 0 || !result.startsWith(/))
{
throw new IllegalArgumentException(
sm.getString(standardRoot.invalidPathNormal, path,
result));
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1588272r1=1588271r2=1588272view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Apr 17 15:01:07 2014
@@ -116,6 +116,11 @@
codeStackOverflowError/code is not treated as a fatal error and can
handled and/or logged as required. (markt)
/fix
+ fix
+bug56409/bug: Avoid codeStackOverflowError/code on non-Windows
+systems if a file named code\/code is encountered when scanning for
+TLDs. (mark)
+ /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: r1588288 - in /tomcat/tc7.0.x/trunk: java/org/apache/catalina/core/ApplicationContext.java webapps/docs/changelog.xml
Author: markt
Date: Thu Apr 17 15:44:07 2014
New Revision: 1588288
URL: http://svn.apache.org/r1588288
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56409
Avoid StackOverflowError on non-Windows systems if a file named '\' is
encountered when scanning for TLDs.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1588288r1=1588287r2=1588288view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
Thu Apr 17 15:44:07 2014
@@ -16,6 +16,7 @@
*/
package org.apache.catalina.core;
+import java.io.File;
import java.io.InputStream;
import java.lang.reflect.InvocationTargetException;
import java.net.MalformedURLException;
@@ -638,7 +639,16 @@ public class ApplicationContext
(sm.getString(applicationContext.resourcePaths.iae, path));
}
-String normalizedPath = RequestUtil.normalize(path);
+String normalizedPath;
+if (File.separatorChar == '\\') {
+// On Windows '\\' is a separator so in case a Windows style
+// separator has managed to make it into the path, replace it.
+normalizedPath = RequestUtil.normalize(path, true);
+} else {
+// On UNIX and similar systems, '\\' is a valid file name so do not
+// convert it to '/'
+normalizedPath = RequestUtil.normalize(path, false);
+}
if (normalizedPath == null)
return (null);
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1588288r1=1588287r2=1588288view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Apr 17 15:44:07 2014
@@ -91,6 +91,11 @@
Only create XML parsing objects if required and fix associated
potential
memory leak in the default Servlet. (markt)
/fix
+ fix
+bug56409/bug: Avoid codeStackOverflowError/code on non-Windows
+systems if a file named code\/code is encountered when scanning for
+TLDs. (mark)
+ /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
svn commit: r1588291 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/jasper/util/ExceptionUtils.java java/org/apache/tomcat/util/ExceptionUtils.java webapps/docs/changelog.xml
Author: markt
Date: Thu Apr 17 15:46:42 2014
New Revision: 1588291
URL: http://svn.apache.org/r1588291
Log:
Modify generic exception handling so that StackOverflowError is not treated as
a fatal error and can handled and/or logged as required.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/jasper/util/ExceptionUtils.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/ExceptionUtils.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1588269
Modified: tomcat/tc7.0.x/trunk/java/org/apache/jasper/util/ExceptionUtils.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/util/ExceptionUtils.java?rev=1588291r1=1588290r2=1588291view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/util/ExceptionUtils.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/util/ExceptionUtils.java Thu
Apr 17 15:46:42 2014
@@ -33,6 +33,10 @@ public class ExceptionUtils {
if (t instanceof ThreadDeath) {
throw (ThreadDeath) t;
}
+if (t instanceof StackOverflowError) {
+// Swallow silently - it should be recoverable
+return;
+}
if (t instanceof VirtualMachineError) {
throw (VirtualMachineError) t;
}
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/ExceptionUtils.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/ExceptionUtils.java?rev=1588291r1=1588290r2=1588291view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/ExceptionUtils.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/ExceptionUtils.java Thu
Apr 17 15:46:42 2014
@@ -33,6 +33,10 @@ public class ExceptionUtils {
if (t instanceof ThreadDeath) {
throw (ThreadDeath) t;
}
+if (t instanceof StackOverflowError) {
+// Swallow silently - it should be recoverable
+return;
+}
if (t instanceof VirtualMachineError) {
throw (VirtualMachineError) t;
}
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=1588291r1=1588290r2=1588291view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Apr 17 15:46:42 2014
@@ -92,6 +92,11 @@
memory leak in the default Servlet. (markt)
/fix
fix
+Modify generic exception handling so that
+codeStackOverflowError/code is not treated as a fatal error and can
+handled and/or logged as required. (markt)
+ /fix
+ fix
bug56409/bug: Avoid codeStackOverflowError/code on non-Windows
systems if a file named code\/code is encountered when scanning for
TLDs. (mark)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56409] A file called \ causes StackOverflowError in tldScanResourcePaths during startup
https://issues.apache.org/bugzilla/show_bug.cgi?id=56409 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #2 from Mark Thomas ma...@apache.org --- Thanks for the report. This has been fixed in 7.0.x and 8.0.x and will be included in 7.0.54 and 8.0.6 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 56425] New: Unable to find unambiguous method in class String
https://issues.apache.org/bugzilla/show_bug.cgi?id=56425
Bug ID: 56425
Summary: Unable to find unambiguous method in class String
Product: Tomcat 7
Version: 7.0.53
Hardware: PC
OS: Linux
Status: NEW
Severity: normal
Priority: P2
Component: Jasper
Assignee: dev@tomcat.apache.org
Reporter: sebastian.ricald...@gmail.com
I am experiencing an issue with my code running in tomcat 7.0.53 which is
returning a JasperException Caused by: javax.el.MethodNotFoundException: Unable
to find unambiguous method: class java.lang.String.replace(java.lang.String,
java.lang.String)
Below is the JSP code causing the problem. This does not happen in previous
versions of Tomcat including 7.0.50 and 7.0.52.
div class=slyout-container ${object.replace('.', '_')}
data-searchbox-target=${target }
object is of type String with values such as module.submodule and I want to
make it module_submodule
Below is the stack trace.
Caused by: org.apache.jasper.JasperException: javax.el.MethodNotFoundException:
Unable to find unambiguous method: class
java.lang.String.replace(java.lang.String, java.lang.String)
at
org.apache.jasper.servlet.JspServletWrapper.handleJspException(JspServletWrapper.java:549)
at
org.apache.jasper.servlet.JspServletWrapper.service(JspServletWrapper.java:470)
at org.apache.jasper.servlet.JspServlet.serviceJspFile(JspServlet.java:390)
at org.apache.jasper.servlet.JspServlet.service(JspServlet.java:334)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:727)
at
org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:303)
at
org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:208)
at
org.apache.catalina.core.ApplicationDispatcher.invoke(ApplicationDispatcher.java:748)
at
org.apache.catalina.core.ApplicationDispatcher.doInclude(ApplicationDispatcher.java:604)
at
org.apache.catalina.core.ApplicationDispatcher.include(ApplicationDispatcher.java:543)
at
org.apache.jasper.runtime.JspRuntimeLibrary.include(JspRuntimeLibrary.java:954)
at org.apache.jsp.layouts.window_jsp._jspService(window_jsp.java:92)
at org.apache.jasper.runtime.HttpJspBase.service(HttpJspBase.java:70)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:727)
at
org.apache.jasper.servlet.JspServletWrapper.service(JspServletWrapper.java:432)
at org.apache.jasper.servlet.JspServlet.serviceJspFile(JspServlet.java:390)
at org.apache.jasper.servlet.JspServlet.service(JspServlet.java:334)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:727)
at
org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:303)
at
org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:208)
at org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:52)
at
org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:241)
at
org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:208)
at
org.apache.catalina.core.ApplicationDispatcher.invoke(ApplicationDispatcher.java:748)
at
org.apache.catalina.core.ApplicationDispatcher.processRequest(ApplicationDispatcher.java:486)
at
org.apache.catalina.core.ApplicationDispatcher.doForward(ApplicationDispatcher.java:411)
at
org.apache.catalina.core.ApplicationDispatcher.forward(ApplicationDispatcher.java:338)
at
org.apache.tiles.servlet.context.ServletTilesRequestContext.forward(ServletTilesRequestContext.java:241)
... 51 more
Caused by: javax.el.MethodNotFoundException: Unable to find unambiguous method:
class java.lang.String.replace(java.lang.String, java.lang.String)
at javax.el.Util.findWrapper(Util.java:333)
at javax.el.Util.findMethod(Util.java:214)
at javax.el.BeanELResolver.invoke(BeanELResolver.java:174)
at org.apache.jasper.el.JasperELResolver.invoke(JasperELResolver.java:139)
at org.apache.el.parser.AstValue.getValue(AstValue.java:173)
at org.apache.el.ValueExpressionImpl.getValue(ValueExpressionImpl.java:184)
at
org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate(PageContextImpl.java:967)
at
org.apache.jsp.WEB_002dINF.views.core.search.searchForm_jsp._jspService(searchForm_jsp.java:171)
at org.apache.jasper.runtime.HttpJspBase.service(HttpJspBase.java:70)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:727)
at
org.apache.jasper.servlet.JspServletWrapper.service(JspServletWrapper.java:432)
... 77 more
Thanks,
Sebastian
--
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: r1588361 - in /tomcat/native/branches/1.1.x: ./ xdocs/images/docs-stylesheet.css
Author: kkolinko
Date: Thu Apr 17 20:20:09 2014
New Revision: 1588361
URL: http://svn.apache.org/r1588361
Log:
Merged r1588195 from tomcat/native/trunk:
Ensure th elements have the same text-align property on every browser.
Modified:
tomcat/native/branches/1.1.x/ (props changed)
tomcat/native/branches/1.1.x/xdocs/images/docs-stylesheet.css
Propchange: tomcat/native/branches/1.1.x/
--
Merged /tomcat/native/trunk:r1588195
Modified: tomcat/native/branches/1.1.x/xdocs/images/docs-stylesheet.css
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/images/docs-stylesheet.css?rev=1588361r1=1588360r2=1588361view=diff
==
--- tomcat/native/branches/1.1.x/xdocs/images/docs-stylesheet.css (original)
+++ tomcat/native/branches/1.1.x/xdocs/images/docs-stylesheet.css Thu Apr 17
20:20:09 2014
@@ -45,6 +45,10 @@ table *:not(table) {
border-collapse: separate;
}
+th {
+ text-align: left;
+}
+
main {
/* Remove this once all IEs support main element */
display: block;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1588366 - /tomcat/trunk/java/org/apache/coyote/http11/AbstractNioInputBuffer.java
Author: kkolinko Date: Thu Apr 17 20:27:45 2014 New Revision: 1588366 URL: http://svn.apache.org/r1588366 Log: Followup to r1588299: svn:eol-style=native Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractNioInputBuffer.java (props changed) Propchange: tomcat/trunk/java/org/apache/coyote/http11/AbstractNioInputBuffer.java -- svn:eol-style = native - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1588390 - /tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
Author: remm
Date: Thu Apr 17 23:43:45 2014
New Revision: 1588390
URL: http://svn.apache.org/r1588390
Log:
Simplify code (apparently unused parameters and methods).
Modified:
tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java?rev=1588390r1=1588389r2=1588390view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java Thu
Apr 17 23:43:45 2014
@@ -18,6 +18,7 @@ package org.apache.coyote.http11;
import java.io.EOFException;
import java.io.IOException;
+import java.nio.ByteBuffer;
import java.nio.channels.Selector;
import org.apache.coyote.InputBuffer;
@@ -34,8 +35,6 @@ import org.apache.tomcat.util.net.Socket
/**
* Implementation of InputBuffer which provides HTTP request header parsing as
* well as transfer decoding.
- *
- * @author a href=mailto:r...@apache.org;Remy Maucherat/a
*/
public class InternalNioInputBuffer extends AbstractNioInputBufferNioChannel
{
@@ -82,57 +81,6 @@ public class InternalNioInputBuffer exte
socket = null;
}
-
-/**
- * Perform blocking read with a timeout if desired
- * @param timeout boolean - if we want to use the timeout data
- * @param block - true if the system should perform a blocking read, false
otherwise
- * @return boolean - true if data was read, false is no data read,
EOFException if EOF is reached
- * @throws IOException if a socket exception occurs
- * @throws EOFException if end of stream is reached
- */
-private int readSocket(boolean timeout, boolean block) throws IOException {
-int nRead = 0;
-socket.getBufHandler().getReadBuffer().clear();
-if ( block ) {
-Selector selector = null;
-try {
-selector = pool.get();
-} catch ( IOException x ) {
-// Ignore
-}
-try {
-NioEndpoint.KeyAttachment att =
-(NioEndpoint.KeyAttachment)
socket.getAttachment(false);
-if (att == null) {
-throw new IOException(Key must be cancelled.);
-}
-nRead = pool.read(socket.getBufHandler().getReadBuffer(),
-socket, selector,
-socket.getIOChannel().socket().getSoTimeout());
-} catch ( EOFException eof ) {
-nRead = -1;
-} finally {
-if ( selector != null ) pool.put(selector);
-}
-} else {
-nRead = socket.read(socket.getBufHandler().getReadBuffer());
-}
-if (nRead 0) {
-socket.getBufHandler().getReadBuffer().flip();
-socket.getBufHandler().getReadBuffer().limit(nRead);
-expand(nRead + pos);
-socket.getBufHandler().getReadBuffer().get(buf, pos, nRead);
-lastValid = pos + nRead;
-return nRead;
-} else if (nRead == -1) {
-//return false;
-throw new EOFException(sm.getString(iib.eof.error));
-} else {
-return 0;
-}
-}
-
// -- Protected Methods
@Override
@@ -158,30 +106,52 @@ public class InternalNioInputBuffer exte
@Override
protected boolean fill(boolean block) throws IOException, EOFException {
-return fill(true,block);
-}
-
-
-protected boolean fill(boolean timeout, boolean block)
-throws IOException, EOFException {
-
-boolean read = false;
-
if (parsingHeader) {
-
if (lastValid headerBufferSize) {
throw new IllegalArgumentException
(sm.getString(iib.requestheadertoolarge.error));
}
-
-// Do a simple read with a short timeout
-read = readSocket(timeout,block)0;
} else {
lastValid = pos = end;
-// Do a simple read with a short timeout
-read = readSocket(timeout, block)0;
}
-return read;
+int nRead = 0;
+ByteBuffer readBuffer = socket.getBufHandler().getReadBuffer();
+readBuffer.clear();
+if ( block ) {
+Selector selector = null;
+try {
+selector = pool.get();
+} catch ( IOException x ) {
+// Ignore
+}
+try {
+NioEndpoint.KeyAttachment att =
+(NioEndpoint.KeyAttachment)
socket.getAttachment(false);
+if (att == null) {
+throw new IOException(Key must be
