[Tomcat Wiki] Update of "LocalBadContent" by KonstantinKolinko
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change notification. The "LocalBadContent" page has been changed by KonstantinKolinko: http://wiki.apache.org/tomcat/LocalBadContent?action=diff&rev1=102&rev2=103 zx\.slave\.ca zyseo\.com # Temporary measures - (my)[\s]+(name|page|web|site) + (my)[\s]+(name|page|web|site|blog) + coupon loans youtube\.com ##--Apache/LocalBadContent - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1461010 - in /tomcat/trunk/java/org/apache/catalina/ha/tcp: SimpleTcpCluster.java mbeans-descriptors.xml
Author: kfujino
Date: Tue Mar 26 08:18:49 2013
New Revision: 1461010
URL: http://svn.apache.org/r1461010
Log:
Remove unused method.
-setProperty
-getProperty
-getPropertyNames
-removeProperty
-transferProperty
These methods for configuring the cluster manager property is not being used.
Modified:
tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
tomcat/trunk/java/org/apache/catalina/ha/tcp/mbeans-descriptors.xml
Modified: tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java?rev=1461010&r1=1461009&r2=1461010&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java Tue Mar
26 08:18:49 2013
@@ -154,11 +154,6 @@ public class SimpleTcpCluster extends Li
*/
private boolean notifyLifecycleListenerOnFailure = false;
-/**
- * dynamic sender properties
- */
-private final Map properties = new HashMap<>();
-
private int channelSendOptions = Channel.SEND_OPTIONS_ASYNCHRONOUS;
private int channelStartOptions = Channel.DEFAULT;
@@ -373,83 +368,6 @@ public class SimpleTcpCluster extends Li
return channel.getLocalMember(true);
}
-// - dynamic
-// manager property handling
-
-/**
- * JMX hack to direct use at jconsole
- *
- * @param name
- * @param value
- */
-public boolean setProperty(String name, String value) {
-return setProperty(name, (Object) value);
-}
-
-/**
- * set config attributes with reflect and propagate to all managers
- *
- * @param name
- * @param value
- */
-public boolean setProperty(String name, Object value) {
-if (log.isTraceEnabled())
-log.trace(sm.getString("SimpleTcpCluster.setProperty", name,
value,properties.get(name)));
-properties.put(name, value);
-//using a dynamic way of setting properties is nice, but a security
risk
-//if exposed through JMX. This way you can sit and try to guess
property names,
-//we will only allow explicit property names
-log.warn("Dynamic setProperty("+name+",value) has been disabled,
please use explicit properties for the element you are trying to identify");
-return false;
-}
-
-/**
- * get current config
- *
- * @param key
- * @return The property
- */
-public Object getProperty(String key) {
-if (log.isTraceEnabled())
-log.trace(sm.getString("SimpleTcpCluster.getProperty", key));
-return properties.get(key);
-}
-
-/**
- * Get all properties keys
- *
- * @return An iterator over the property names.
- */
-public Iterator getPropertyNames() {
-return properties.keySet().iterator();
-}
-
-/**
- * remove a configured property.
- *
- * @param key
- */
-public void removeProperty(String key) {
-properties.remove(key);
-}
-
-/**
- * transfer properties from cluster configuration to subelement bean.
- * @param prefix
- * @param bean
- */
-protected void transferProperty(String prefix, Object bean) {
-if (prefix != null) {
-for (Iterator iter = getPropertyNames(); iter.hasNext();) {
-String pkey = iter.next();
-if (pkey.startsWith(prefix)) {
-String key = pkey.substring(prefix.length() + 1);
-Object value = getProperty(pkey);
-IntrospectionUtils.setProperty(bean, key,
value.toString());
-}
-}
-}
-}
// - Public Methods
Modified: tomcat/trunk/java/org/apache/catalina/ha/tcp/mbeans-descriptors.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/tcp/mbeans-descriptors.xml?rev=1461010&r1=1461009&r2=1461010&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/tcp/mbeans-descriptors.xml
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/tcp/mbeans-descriptors.xml Tue Mar
26 08:18:49 2013
@@ -53,20 +53,6 @@
type="java.lang.String"
writeable="false"/>
-
-
-
-
svn commit: r1461021 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/coyote/http11/ java/org/apache/tomcat/jni/ java/org/apache/tomcat/util/net/ java/org/apache/tomcat/util/net/res/ webapps/docs/
Author: kkolinko
Date: Tue Mar 26 08:48:14 2013
New Revision: 1461021
URL: http://svn.apache.org/r1461021
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54324
Allow APR connector to disable TLS compression when OpenSSL supports it.
Patch by schultz
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/SSL.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties
tomcat/tc6.0.x/trunk/webapps/docs/apr.xml
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=1461021&r1=1461020&r2=1461021&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Mar 26 08:48:14 2013
@@ -80,15 +80,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: kkolinko, markt
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54324
- Allow APR connector to disable TLS compression when OpenSSL supports it.
- http://svn.apache.org/viewvc?view=revision&revision=1434887
- http://svn.apache.org/viewvc?view=revision&revision=1435769 - Javadoc fix
- http://svn.apache.org/viewvc?view=revision&revision=1457378 - Fix message
broken during backport to TC7
- (r1434882 r1435767 in trunk)
- +1: schultz, markt, kkolinko
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54456
If the client aborts the request, make sure this is communicated to the
application reading the request body.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=1461021&r1=1461020&r2=1461021&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
Tue Mar 26 08:48:14 2013
@@ -488,6 +488,12 @@ public class Http11AprProtocol extends A
public int getSSLVerifyDepth() { return endpoint.getSSLVerifyDepth(); }
public void setSSLVerifyDepth(int SSLVerifyDepth) {
endpoint.setSSLVerifyDepth(SSLVerifyDepth); }
+/**
+ * Disable SSL compression.
+ */
+public boolean getSSLDisableCompression() { return
((AprEndpoint)endpoint).getSSLDisableCompression(); }
+public void setSSLDisableCompression(boolean disable) {
((AprEndpoint)endpoint).setSSLDisableCompression(disable); }
+
/**
* When client certificate information is presented in a form other than
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/SSL.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/SSL.java?rev=1461021&r1=1461020&r2=1461021&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/SSL.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/SSL.java Tue Mar 26
08:48:14 2013
@@ -116,6 +116,8 @@ public final class SSL {
/* As server, disallow session resumption on renegotiation */
public static final int SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION =
0x0001;
+/* Don't use compression even if supported */
+public static final int SSL_OP_NO_COMPRESSION =
0x0002;
/* If set, always create a new key when using tmp_dh parameters */
public static final int SSL_OP_SINGLE_DH_USE=
0x0010;
/* Set to always use the tmp_rsa key when doing RSA operations,
@@ -335,8 +337,13 @@ public final class SSL {
/**
* Return true if all the requested SSL_OP_* are supported by OpenSSL.
+ *
+ * Note that for versions of tcnative < 1.1.25, this method will
+ * return true if and only if op=
+ * {@link #SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION} and tcnative
+ * supports that flag.
*
- * @param Bitwise-OR of all SSL_OP_* to test.
+ * @param op Bitwise-OR of all SSL_OP_* to test.
*
* @return true if all SSL_OP_* are supported by OpenSSL library.
*/
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1461021&r1=1461020&r2=1461021&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Tue
Mar 26 08:48:14 2013
@@ -529,6 +529,20 @@ public class
[Bug 54324] Support is required to disable TLS compression to prevent against CRIME attacks
https://issues.apache.org/bugzilla/show_bug.cgi?id=54324 --- Comment #7 from Konstantin Kolinko --- Implemented in Tomcat 6.0 by r1461021 , will be in 6.0.37 -- 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: r1461026 - /tomcat/trunk/webapps/docs/config/http.xml
Author: kkolinko Date: Tue Mar 26 08:56:33 2013 New Revision: 1461026 URL: http://svn.apache.org/r1461026 Log: Fix a typo Modified: tomcat/trunk/webapps/docs/config/http.xml Modified: tomcat/trunk/webapps/docs/config/http.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/http.xml?rev=1461026&r1=1461025&r2=1461026&view=diff == --- tomcat/trunk/webapps/docs/config/http.xml (original) +++ tomcat/trunk/webapps/docs/config/http.xml Tue Mar 26 08:56:33 2013 @@ -1203,7 +1203,7 @@ Disables compression if set to true and OpenSSL supports - disabling comprssion. Default is false which inherits the + disabling compression. Default is false which inherits the default compression setting in OpenSSL. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53871] java.lang.StackOverflowError on deploying a web application
https://issues.apache.org/bugzilla/show_bug.cgi?id=53871 --- Comment #17 from Joseph Walton --- Thanks for the new class hierarchy message. Running tomcat master with that improvement showed me exactly what the problem was - a loop caused by an incompatible version of Jaxen bundled with an old dom4j. Upgrading the dependencies in my webapp 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: r1461028 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/config/http.xml
Author: kkolinko Date: Tue Mar 26 09:16:27 2013 New Revision: 1461028 URL: http://svn.apache.org/r1461028 Log: Merged r1461026 from tomcat/trunk: Fix a typo Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1461026 Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml?rev=1461028&r1=1461027&r2=1461028&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml Tue Mar 26 09:16:27 2013 @@ -1203,7 +1203,7 @@ Disables compression if set to true and OpenSSL supports - disabling comprssion. Default is false which inherits the + disabling compression. Default is false which inherits the default compression setting in OpenSSL. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1461036 - in /tomcat/site/trunk: docs/index.html docs/oldnews.html xdocs/index.xml xdocs/oldnews.xml
Author: kkolinko Date: Tue Mar 26 09:32:31 2013 New Revision: 1461036 URL: http://svn.apache.org/r1461036 Log: Release announcement for Tomcat Maven Plugin 2.1 It has been released a month ago. Modified: tomcat/site/trunk/docs/index.html tomcat/site/trunk/docs/oldnews.html tomcat/site/trunk/xdocs/index.xml tomcat/site/trunk/xdocs/oldnews.xml Modified: tomcat/site/trunk/docs/index.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1461036&r1=1461035&r2=1461036&view=diff == --- tomcat/site/trunk/docs/index.html (original) +++ tomcat/site/trunk/docs/index.html Tue Mar 26 09:32:31 2013 @@ -227,6 +227,86 @@ project logo are trademarks of the Apach + +Tomcat Maven Plugin 2.1 Released2013-02-25 + + + + + + + +The Apache Tomcat team is pleased to +http://mail-archives.apache.org/mod_mbox/tomcat-users/201302.mbox/%3CCAPoyBqQwb6wHOFnOn5Pd3BoQ-TsvYMu%2BYeAjxSzcZRaX2ZR-hw%40mail.gmail.com%3E";>announce +the release of Tomcat Maven Plugin 2.1. + + + +The Apache Tomcat Maven Plugin provides goals +to manipulate WAR projects within the Apache Tomcat servlet container. + + + +The binaries are available from Maven repositories. You should specify the +version in your project's plugin configuration: + + + + + + + + + + ++ + + + + + + + + +or + + + + + + + + +org.apache.tomcat.maven +tomcat7-maven-plugin +2.1 ++ + + + + + + + + + + + + + + + + + + + + + Tomcat 7.0.37 Released2013-02-18 @@ -346,86 +426,6 @@ Apache Tomcat. This release includes sec - -Tomcat Maven Plugin 2.0 Released2012-09-14 - - - - - - - -The Apache Tomcat team is pleased to -http://mail-archives.apache.org/mod_mbox/tomcat-announce/201209.mbox/%3CCAPoyBqRLPukj%3D8d0XQOgV_%2BewB31-s6SOG6%3D8m3gDcYLo-%2BOpA%40mail.gmail.com%3E";>announce -the release of Tomcat Maven Plugin 2.0. - - - -The Apache Tomcat Maven Plugin provides goals -to manipulate WAR projects within the Apache Tomcat servlet container. - - - -The binaries are available from Maven repositories. You should specify the -version in your project's plugin configuration: - - - - - - - - - - -org.apache.tomcat.maven +tomcat6-maven-plugin +2.1 +- - - - - - - - - -or - - - - - - - - -org.apache.tomcat.maven -tomcat6-maven-plugin -2.0 -- - - - - - - - - - - - - - - - - - - - - - Tomcat Connectors 1.2.37 Released2012-05-31 Modified: tomcat/site/trunk/docs/oldnews.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews.html?rev=1461036&r1=1461035&r2=1461036&view=diff == --- tomcat/site/trunk/docs/oldnews.html (original) +++ tomcat/site/trunk/docs/oldnews.html Tue Mar 26 09:32:31 2013 @@ -417,6 +417,86 @@ Full details of these changes, and all t + +Tomcat Maven Plugin 2.0 Released2012-09-14 + + + + + + + +The Apache Tomcat team is pleased to +http://mail-archives.apache.org/mod_mbox/tomcat-announce/201209.mbox/%3CCAPoyBqRLPukj%3D8d0XQOgV_%2BewB31-s6SOG6%3D8m3gDcYLo-%2BOpA%40mail.gmail.com%3E";>announce +the release of Tomcat Maven Plugin 2.0. + + + +The Apache Tomcat Maven Plugin provides goals +to manipulate WAR projects within the Apache Tomcat servlet container. + + + +The binaries are available from Maven repositories. You should specify the +version in your project's plugin configuration: + + + + + + + + + + +org.apache.tomcat.maven -tomcat7-maven-plugin -2.0 -+ + + + + + + + + +or + + + + + + + + +org.apache.tomcat.maven +tomcat6-maven-plugin +2.0 ++ + + + + + + + + + + + + + + + + + + + + + Tomcat 7.0.30 Released2012-09-06 Modified: tomcat/site/trunk/xdocs/index.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/index.xml?rev=1461036&r1=1461035&r2=1461036&view=diff == --- tomcat/site/trunk/xdocs/index.xml (original) +++ tomcat/site/trunk/xdocs/index.xml Tue Mar 26 09:32:31 2013 @@ -37,6 +37,37 @@ project logo are trademarks of the Apach + + +The Apache Tomcat team is pleased to +http://mail-archives.apache.org/mod_mbox/tomcat-users/201302.mbox/%3CCAPoyBqQwb6wHOFnOn5Pd3BoQ-TsvYMu%2BYeAjxSzcZRaX2ZR-hw%40mail.gmail.com%3E";>announce +the release of Tomcat Maven Plugin 2.1. + + +The Apache Tomcat Maven Plugin provides goals +to manipulate WARorg.apache.tomcat.maven +tomcat7-maven-plugin +2.0 +
svn commit: r1461086 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Author: kkolinko Date: Tue Mar 26 12:35:08 2013 New Revision: 1461086 URL: http://svn.apache.org/r1461086 Log: bin/daemon.sh was added in r1202063 (7.0.23). Mention it in changelog. Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml 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=1461086&r1=1461085&r2=1461086&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Mar 26 12:35:08 2013 @@ -3069,6 +3069,11 @@ JAR is now required by the Ant tasks. Patch provided by Volker Krebs. (markt) + +Add sample Apache Commons Daemon JSVC wrapper script +bin/daemon.sh that can be used with /etc/init.d. +(mturk) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1461091 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Tue Mar 26 12:44:40 2013 New Revision: 1461091 URL: http://svn.apache.org/r1461091 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=1461091&r1=1461090&r2=1461091&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Mar 26 12:44:40 2013 @@ -103,6 +103,15 @@ PATCHES PROPOSED TO BACKPORT: +1: kkolinko -1: +* Add sample Apache Commons Daemon JSVC wrapper script bin/daemon.sh that + can be used with /etc/init.d. + This file is needed, as it has been removed from Commons Daemon and thus + a reference to it in docs/setup.html became incorrect. + This copy of daemon.sh differs from Tomcat trunk one in initialization of + CLASSPATH setting, because tomcat-juli.jar has to be handled differently. + http://people.apache.org/~kkolinko/patches/2013-03-26_tc6_daemonsh.patch + +1: kkolinko + -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
[jira] [Commented] (MTOMCAT-186) Closing executable JAR does not call ServletContextListener.contextDestroyed()
[
https://issues.apache.org/jira/browse/MTOMCAT-186?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13613742#comment-13613742
]
Tomasz Nurkiewicz commented on MTOMCAT-186:
---
Thank you for the fix, I confirm, 2.1 works as expected. It's actually a Spring
application that shuts down gracefully.
> Closing executable JAR does not call ServletContextListener.contextDestroyed()
> --
>
> Key: MTOMCAT-186
> URL: https://issues.apache.org/jira/browse/MTOMCAT-186
> Project: Apache Tomcat Maven Plugin
> Issue Type: Bug
> Components: tomcat7
>Affects Versions: 2.0
> Environment: Java 7, maven 3.0.3
>Reporter: Tomasz Nurkiewicz
>Assignee: Olivier Lamy (*$^¨%`£)
>Priority: Minor
> Fix For: 2.1
>
> Attachments: listener.zip
>
>
> Executable JAR created by {{tomcat7-maven-plugin:exec-war-only}} does not
> call {{ServletContextListener.contextDestroyed()}} callback method when Java
> process is killed or when Ctrl + C is pressed. There is no way (?) to cleanly
> shutdown web application.
> The same application (attached) deployed on standalone Tomcat works just
> fine. Hitting Ctrl + C correctly undeploys and shuts down application.
> Build attached application and run {{java -jar target/standalone.jar}}. Ctrl
> + C kills the process immediately. On the other hand {standalone.war}}
> deployed to normal Tomcat under {{/webapps}} shuts down correctly and we can
> see log statement from {{contextDestroyed()}}.
--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1461110 - in /tomcat/trunk: build.properties.default res/ide-support/eclipse/eclipse.classpath res/maven/tomcat-embed-jasper.pom res/maven/tomcat-jasper.pom
Author: kkolinko
Date: Tue Mar 26 13:10:24 2013
New Revision: 1461110
URL: http://svn.apache.org/r1461110
Log:
Update to Eclipse JDT Compiler 4.2.2
Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/res/ide-support/eclipse/eclipse.classpath
tomcat/trunk/res/maven/tomcat-embed-jasper.pom
tomcat/trunk/res/maven/tomcat-jasper.pom
Modified: tomcat/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1461110&r1=1461109&r2=1461110&view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Tue Mar 26 13:10:24 2013
@@ -123,8 +123,8 @@ wsdl4j-lib.loc=${base-maven.loc}/wsdl4j/
wsdl4j-lib.jar=${wsdl4j-lib.home}/wsdl4j-${wsdl4j-lib.version}.jar
# - Eclipse JDT, version 3.2 or later -#
-jdt.version=4.2.1
-jdt.release=R-4.2.1-201209141800
+jdt.version=4.2.2
+jdt.release=R-4.2.2-201302041200
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/trunk/res/ide-support/eclipse/eclipse.classpath
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/ide-support/eclipse/eclipse.classpath?rev=1461110&r1=1461109&r2=1461110&view=diff
==
--- tomcat/trunk/res/ide-support/eclipse/eclipse.classpath (original)
+++ tomcat/trunk/res/ide-support/eclipse/eclipse.classpath Tue Mar 26 13:10:24
2013
@@ -25,6 +25,6 @@
-
+
Modified: tomcat/trunk/res/maven/tomcat-embed-jasper.pom
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-embed-jasper.pom?rev=1461110&r1=1461109&r2=1461110&view=diff
==
--- tomcat/trunk/res/maven/tomcat-embed-jasper.pom (original)
+++ tomcat/trunk/res/maven/tomcat-embed-jasper.pom Tue Mar 26 13:10:24 2013
@@ -39,7 +39,7 @@
org.eclipse.jdt.core.compiler
ecj
- 4.2.1
+ 4.2.2
Modified: tomcat/trunk/res/maven/tomcat-jasper.pom
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-jasper.pom?rev=1461110&r1=1461109&r2=1461110&view=diff
==
--- tomcat/trunk/res/maven/tomcat-jasper.pom (original)
+++ tomcat/trunk/res/maven/tomcat-jasper.pom Tue Mar 26 13:10:24 2013
@@ -57,7 +57,7 @@
org.eclipse.jdt.core.compiler
ecj
- 4.2.1
+ 4.2.2
org.apache.tomcat
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1461116 - in /tomcat/tc7.0.x/trunk: ./ build.properties.default res/ide-support/eclipse/eclipse.classpath res/maven/tomcat-embed-jasper.pom res/maven/tomcat-jasper.pom webapps/docs/change
Author: kkolinko
Date: Tue Mar 26 13:19:12 2013
New Revision: 1461116
URL: http://svn.apache.org/r1461116
Log:
Merged r1461110 from tomcat/trunk:
Update to Eclipse JDT Compiler 4.2.2
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/build.properties.default
tomcat/tc7.0.x/trunk/res/ide-support/eclipse/eclipse.classpath
tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-jasper.pom
tomcat/tc7.0.x/trunk/res/maven/tomcat-jasper.pom
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1461110
Modified: tomcat/tc7.0.x/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.properties.default?rev=1461116&r1=1461115&r2=1461116&view=diff
==
--- tomcat/tc7.0.x/trunk/build.properties.default (original)
+++ tomcat/tc7.0.x/trunk/build.properties.default Tue Mar 26 13:19:12 2013
@@ -123,8 +123,8 @@ wsdl4j-lib.loc=${base-maven.loc}/wsdl4j/
wsdl4j-lib.jar=${wsdl4j-lib.home}/wsdl4j-${wsdl4j-lib.version}.jar
# - Eclipse JDT, version 3.2 or later -#
-jdt.version=4.2.1
-jdt.release=R-4.2.1-201209141800
+jdt.version=4.2.2
+jdt.release=R-4.2.2-201302041200
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/tc7.0.x/trunk/res/ide-support/eclipse/eclipse.classpath
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/ide-support/eclipse/eclipse.classpath?rev=1461116&r1=1461115&r2=1461116&view=diff
==
--- tomcat/tc7.0.x/trunk/res/ide-support/eclipse/eclipse.classpath (original)
+++ tomcat/tc7.0.x/trunk/res/ide-support/eclipse/eclipse.classpath Tue Mar 26
13:19:12 2013
@@ -25,6 +25,6 @@
-
+
Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-jasper.pom
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-jasper.pom?rev=1461116&r1=1461115&r2=1461116&view=diff
==
--- tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-jasper.pom (original)
+++ tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-jasper.pom Tue Mar 26 13:19:12
2013
@@ -39,7 +39,7 @@
org.eclipse.jdt.core.compiler
ecj
- 4.2.1
+ 4.2.2
Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-jasper.pom
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-jasper.pom?rev=1461116&r1=1461115&r2=1461116&view=diff
==
--- tomcat/tc7.0.x/trunk/res/maven/tomcat-jasper.pom (original)
+++ tomcat/tc7.0.x/trunk/res/maven/tomcat-jasper.pom Tue Mar 26 13:19:12 2013
@@ -57,7 +57,7 @@
org.eclipse.jdt.core.compiler
ecj
- 4.2.1
+ 4.2.2
org.apache.tomcat
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=1461116&r1=1461115&r2=1461116&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Mar 26 13:19:12 2013
@@ -78,6 +78,9 @@
+Update to Eclipse JDT Compiler 4.2.2. (kkolinko)
+
+
Convert remaining unit tests to JUnit 4 and enable Checkstyle rule
that forbids use of methods from JUnit 3. (markt/kkolinko)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a restored build on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/1163 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1461086 Blamelist: kkolinko Build succeeded! sincerely, -The Buildbot
[Bug 54754] New: WebSocket endpoint servlet mappings shadowed by "/" mapping
https://issues.apache.org/bugzilla/show_bug.cgi?id=54754
Bug ID: 54754
Summary: WebSocket endpoint servlet mappings shadowed by "/"
mapping
Product: Tomcat 8
Version: trunk
Hardware: PC
OS: Linux
Status: NEW
Severity: normal
Priority: P2
Component: Catalina
Assignee: dev@tomcat.apache.org
Reporter: rstoyanc...@yahoo.com
Classification: Unclassified
Currently WebSocket endpoints are mapped via Servlet mappings, which does not
appear to work if another Servlet is mapped with "/" or "/*". The root servlet
mapping in particular is very commonly preferred over mapping by prefix (e.g.
"/app/*") or by extension ("/*.do") in order to keep URLs meaningful and
without any additional path segments or extension (see for example [1]).
Replacing WsServlet with WsFilter would allow WebSocket endpoints to be mapped
to specific paths without interfering with Servlet mappings.
[1]
http://stackoverflow.com/questions/2129876/using-spring-mapping-to-root-in-web-xml-static-resources-arent-found
--
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: r1461136 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Tue Mar 26 14:01:25 2013 New Revision: 1461136 URL: http://svn.apache.org/r1461136 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=1461136&r1=1461135&r2=1461136&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Mar 26 14:01:25 2013 @@ -113,6 +113,12 @@ PATCHES PROPOSED TO BACKPORT: +1: kkolinko -1: +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54615 + Update to Eclipse JDT Compiler 4.2.2 + http://people.apache.org/~kkolinko/patches/2013-03-26_tc6_eclipse422.patch + +1: kkolinko + -1: + PATCHES/ISSUES THAT ARE STALLED * Backport JSP unloading patch (BZ48358). - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54754] WebSocket endpoint servlet mappings shadowed by "/" mapping
https://issues.apache.org/bugzilla/show_bug.cgi?id=54754 --- Comment #1 from Mark Thomas --- What URIs are you mapping your web socket servlets to? -- 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 failure in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a new failure on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/1164 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1461116 Blamelist: kkolinko BUILD FAILED: failed compile_1 sincerely, -The Buildbot
[Bug 54754] WebSocket endpoint servlet mappings shadowed by "/" mapping
https://issues.apache.org/bugzilla/show_bug.cgi?id=54754 --- Comment #2 from rstoyanc...@yahoo.com --- The easiest way to reproduce is to add "/" Servlet to tomcat/trunk/webapps/examples/WEB-INF/web.xml after which websocket echo no longer works. -- 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 54754] WebSocket endpoint servlet mappings shadowed by "/" mapping
https://issues.apache.org/bugzilla/show_bug.cgi?id=54754 --- Comment #3 from rstoyanc...@yahoo.com --- Note that Spring MVC can delegate back to the "default" Servlet container servlet, if no mapping is found [1]. That said is there any downside to a WsFilter? Seems less obtrusive and FWIW the RI does that. [1] http://static.springsource.org/spring-framework/docs/current/spring-framework-reference/html/mvc.html#mvc-default-servlet-handler -- 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 54755] New: Type-based Endpoint types cannot be deployed by instance
https://issues.apache.org/bugzilla/show_bug.cgi?id=54755 Bug ID: 54755 Summary: Type-based Endpoint types cannot be deployed by instance Product: Tomcat 8 Version: trunk Hardware: PC OS: Linux Status: NEW Severity: normal Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: rstoyanc...@yahoo.com Classification: Unclassified For type-based Endpoint's, WsServlet instantiates the Endpoint via reflection instead of using the Configurator as is done in PojoEndpointServer: sec.getConfigurator().getEndpointInstance(sec.getEndpointClass()) -- 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 54755] Type-based Endpoint's cannot be deployed by instance
https://issues.apache.org/bugzilla/show_bug.cgi?id=54755 rstoyanc...@yahoo.com changed: What|Removed |Added Summary|Type-based Endpoint types |Type-based Endpoint's |cannot be deployed by |cannot be deployed by |instance|instance -- 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: r1461160 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Tue Mar 26 14:56:26 2013 New Revision: 1461160 URL: http://svn.apache.org/r1461160 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=1461160&r1=1461159&r2=1461160&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Mar 26 14:56:26 2013 @@ -119,6 +119,12 @@ PATCHES PROPOSED TO BACKPORT: +1: kkolinko -1: +* Update the native component of the APR/native connector to 1.1.27 and + make that version the recommended minimum version. + http://svn.apache.org/r1445210 + +1: kkolinko + -1: + PATCHES/ISSUES THAT ARE STALLED * Backport JSP unloading patch (BZ48358). - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54755] Type-based Endpoint's cannot be deployed by instance
https://issues.apache.org/bugzilla/show_bug.cgi?id=54755 --- Comment #1 from rstoyanc...@yahoo.com --- Created attachment 30104 --> https://issues.apache.org/bugzilla/attachment.cgi?id=30104&action=edit Patch for WsServlet Here is a sample patch for the 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
[Bug 54756] New: EXCEPTION_ACCESS_VIOLATION with APR crashing Tomcat
https://issues.apache.org/bugzilla/show_bug.cgi?id=54756 Bug ID: 54756 Summary: EXCEPTION_ACCESS_VIOLATION with APR crashing Tomcat Product: Tomcat 7 Version: 7.0.37 Hardware: PC Status: NEW Severity: major Priority: P2 Component: Connectors Assignee: dev@tomcat.apache.org Reporter: ms...@cortive.ca Classification: Unclassified Created attachment 30105 --> https://issues.apache.org/bugzilla/attachment.cgi?id=30105&action=edit Crash log We updated server from 7.0.29 to 7.0.37 and within 48 hours we have observed a crash. Log is attached. Another similar report can be found here: https://issues.apache.org/bugzilla/show_bug.cgi?id=54046 -- 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 54756] EXCEPTION_ACCESS_VIOLATION with APR crashing Tomcat
https://issues.apache.org/bugzilla/show_bug.cgi?id=54756 Michael changed: What|Removed |Added Attachment #30105|0 |1 is obsolete|| --- Comment #1 from Michael --- Created attachment 30106 --> https://issues.apache.org/bugzilla/attachment.cgi?id=30106&action=edit Crash log Adding log as plain text. Didn't see it was set to auto detect. -- 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 54756] EXCEPTION_ACCESS_VIOLATION with APR crashing Tomcat
https://issues.apache.org/bugzilla/show_bug.cgi?id=54756 Konstantin Kolinko changed: What|Removed |Added OS||All --- Comment #2 from Konstantin Kolinko --- 1. No need to re-upload an attachment. You can edit its mime-type. 2. You have not mentioned, but here is the essential bit. The thread that crashed: (citing it for sake of those who search through bugzilla) Java frames: (J=compiled Java code, j=interpreted, Vv=VM code) j org.apache.tomcat.jni.Socket.send(J[BII)I+0 j org.apache.coyote.http11.upgrade.UpgradeAprProcessor.write(I)V+14 j org.apache.coyote.http11.upgrade.UpgradeOutbound.write(I)V+5 j org.apache.catalina.websocket.WsOutbound.doWriteBytes(Ljava/nio/ByteBuffer;Z)V+45 j org.apache.catalina.websocket.WsOutbound.doWriteText(Ljava/nio/CharBuffer;Z)V+65 j org.apache.catalina.websocket.WsOutbound.writeTextMessage(Ljava/nio/CharBuffer;)V+44 j org.atmosphere.container.version.TomcatWebSocket.write(Lorg/atmosphere/cpr/AtmosphereResponse;Ljava/lang/String;)Lorg/atmosphere/websocket/WebSocket;+103 j org.atmosphere.container.version.TomcatWebSocket.write(Lorg/atmosphere/cpr/AtmosphereResponse;Ljava/lang/String;)Lorg/atmosphere/cpr/AsyncIOWriter;+3 j org.atmosphere.cpr.AtmosphereResponse$4.write(Ljava/lang/String;)V+36 j org.atmosphere.handler.AbstractReflectorAtmosphereHandler.onStateChange(Lorg/atmosphere/cpr/AtmosphereResourceEvent;)V+337 j org.atmosphere.cpr.DefaultBroadcaster.invokeOnStateChange(Lorg/atmosphere/cpr/AtmosphereResource;Lorg/atmosphere/cpr/AtmosphereResourceEvent;)V+7 j org.atmosphere.cpr.DefaultBroadcaster.prepareInvokeOnStateChange(Lorg/atmosphere/cpr/AtmosphereResource;Lorg/atmosphere/cpr/AtmosphereResourceEvent;)V+97 j org.atmosphere.cpr.DefaultBroadcaster.executeAsyncWrite(Lorg/atmosphere/cpr/DefaultBroadcaster$AsyncWriteToken;)V+313 j org.atmosphere.cpr.DefaultBroadcaster$3.run()V+385 j java.util.concurrent.Executors$RunnableAdapter.call()Ljava/lang/Object;+4 j java.util.concurrent.FutureTask$Sync.innerRun()V+30 j java.util.concurrent.FutureTask.run()V+4 j java.util.concurrent.ThreadPoolExecutor$Worker.runTask(Ljava/lang/Runnable;)V+59 j java.util.concurrent.ThreadPoolExecutor$Worker.run()V+28 j java.lang.Thread.run()V+11 v ~StubRoutines::call_stub -- 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 54756] EXCEPTION_ACCESS_VIOLATION with APR crashing Tomcat
https://issues.apache.org/bugzilla/show_bug.cgi?id=54756 --- Comment #3 from Michael --- Thanks Konstantin. Didn't see where I could update the MIME type, but I see that now. Running a few test to see if I can pin point the issue. Thought I would start with the crash log. Originally I suspected the Atmosphere Framework, but they suggested it looks like a Tomcat 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
svn commit: r1461317 - in /tomcat/trunk: java/org/apache/tomcat/websocket/ test/org/apache/tomcat/util/net/ test/org/apache/tomcat/websocket/
Author: markt
Date: Tue Mar 26 21:17:18 2013
New Revision: 1461317
URL: http://svn.apache.org/r1461317
Log:
First cut of an SSL client implementation for WebSocket and a simple test case
to demonstrate that it works.
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapper.java
tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperNonSecure.java
tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java
tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapper.java?rev=1461317&r1=1461316&r2=1461317&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapper.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapper.java Tue
Mar 26 21:17:18 2013
@@ -21,6 +21,8 @@ import java.nio.channels.CompletionHandl
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
+import javax.net.ssl.SSLException;
+
/**
* This is a wrapper for a {@link java.nio.channels.AsynchronousSocketChannel}
* that limits the methods available thereby simplifying the process of
@@ -40,4 +42,6 @@ public interface AsyncChannelWrapper {
CompletionHandler handler);
void close();
+
+Future handshake() throws SSLException;
}
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperNonSecure.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperNonSecure.java?rev=1461317&r1=1461316&r2=1461317&view=diff
==
---
tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperNonSecure.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperNonSecure.java
Tue Mar 26 21:17:18 2013
@@ -20,8 +20,10 @@ import java.io.IOException;
import java.nio.ByteBuffer;
import java.nio.channels.AsynchronousSocketChannel;
import java.nio.channels.CompletionHandler;
+import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
/**
* Generally, just passes calls straight to the wrapped
@@ -30,6 +32,8 @@ import java.util.concurrent.TimeUnit;
*/
public class AsyncChannelWrapperNonSecure implements AsyncChannelWrapper {
+private static final Future NOOP_FUTURE = new NoOpFuture();
+
private final AsynchronousSocketChannel socketChannel;
public AsyncChannelWrapperNonSecure(
@@ -69,4 +73,40 @@ public class AsyncChannelWrapperNonSecur
// Ignore
}
}
+
+@Override
+public Future handshake() {
+return NOOP_FUTURE;
+}
+
+
+private static final class NoOpFuture implements Future {
+
+@Override
+public boolean cancel(boolean mayInterruptIfRunning) {
+return false;
+}
+
+@Override
+public boolean isCancelled() {
+return false;
+}
+
+@Override
+public boolean isDone() {
+return true;
+}
+
+@Override
+public Void get() throws InterruptedException, ExecutionException {
+return null;
+}
+
+@Override
+public Void get(long timeout, TimeUnit unit)
+throws InterruptedException, ExecutionException,
+TimeoutException {
+return null;
+}
+}
}
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java?rev=1461317&r1=1461316&r2=1461317&view=diff
==
---
tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java
Tue Mar 26 21:17:18 2013
@@ -16,53 +16,505 @@
*/
package org.apache.tomcat.websocket;
+import java.io.EOFException;
+import java.io.IOException;
import java.nio.ByteBuffer;
import java.nio.channels.AsynchronousSocketChannel;
import java.nio.channels.CompletionHandler;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.
svn commit: r1461318 - /tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServlet.java
Author: markt
Date: Tue Mar 26 21:19:51 2013
New Revision: 1461318
URL: http://svn.apache.org/r1461318
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54755
Endpoint instantiation should be via Configurator
Patch provided by rstoyanchev
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServlet.java
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServlet.java?rev=1461318&r1=1461317&r2=1461318&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServlet.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServlet.java Tue Mar
26 21:19:51 2013
@@ -135,11 +135,12 @@ public class WsServlet extends HttpServl
try {
Class clazz = sec.getEndpointClass();
if (Endpoint.class.isAssignableFrom(clazz)) {
-ep = (Endpoint) sec.getEndpointClass().newInstance();
+ep = (Endpoint) sec.getConfigurator().getEndpointInstance(
+sec.getEndpointClass());
} else {
ep = new PojoEndpointServer();
}
-} catch (InstantiationException | IllegalAccessException e) {
+} catch (InstantiationException e) {
throw new ServletException(e);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54755] Type-based Endpoint's cannot be deployed by instance
https://issues.apache.org/bugzilla/show_bug.cgi?id=54755 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #2 from Mark Thomas --- Thanks for the patch. It has been applied to trunk. -- 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: r1461319 - /tomcat/trunk/webapps/docs/changelog.xml
Author: markt Date: Tue Mar 26 21:21:09 2013 New Revision: 1461319 URL: http://svn.apache.org/r1461319 Log: Add Rossen 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=1461319&r1=1461318&r2=1461319&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Tue Mar 26 21:21:09 2013 @@ -52,7 +52,7 @@ Implement JSR 356 - WebSockets. The JSR 356 implementation includes -contributions from Nick Williams. (markt) +contributions from Nick Williams and Rossen Stoyanchev. (markt) 45995: Align Tomcat with Apache httpd and perform MIME type - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54754] WebSocket endpoint servlet mappings shadowed by "/" mapping
https://issues.apache.org/bugzilla/show_bug.cgi?id=54754
--- Comment #4 from Mark Thomas ---
Hmm. That behavior isn't what I'd expect. Let me take a look to figure out what
I am missing.
My only reluctance to switch to a filter is that it is more work and I have
enough of that already. That said, if there are scenarios that simply can't be
matched with a Servlet (and I suspect that there are once you start looking at
URI templates of the form /{parma1}/... ) then there may be no choice but to
switch to Filter.
--
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 54754] WebSocket endpoint servlet mappings shadowed by "/" mapping
https://issues.apache.org/bugzilla/show_bug.cgi?id=54754 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |INVALID --- Comment #5 from Mark Thomas --- The only reason the examples fail is that by mapping a servlet to / you are overriding the default servlet that is used to serve the HTML files. If you change the files to have .jsp extensions (and change the links) you'll be able to access the pages. Alternatively, you could point a WebSocket client directly at the appropriate URL. I'll look into my own concerns regarding mapping and URI templates separately. -- 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: [VOTE] Release Apache Tomcat 7.0.39
On 22/03/2013 16:48, Mark Thomas wrote: > The proposed Apache Tomcat 7.0.39 release is now available for voting. > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.39/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-015/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_39/ > > The proposed 7.0.39 release is: > [ ] Broken - do not release > [X] Stable - go ahead and release as 7.0.39 Stable Unit tests pass on 64-bit Windows and 64-bit Linux EL TCK passes JSP TCK passes with HTTP (direct) BIO, NIO & APR/native (1.1.27) Servlet TCK passes with - HTTP (direct) BIO, NIO & APR/native (1.1.27) - HTTP (mod_proxy_http) BIO, NIO & APR/native (1.1.27) - AJP (mod_jk) BIO, NIO & APR/native (1.1.27) - AJP (mod_proxy_ajp) BIO, NIO & APR/native (1.1.27) All TCK tests run on 64-bit Linux with a security manager Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[RESULT][VOTE] Release Apache Tomcat 7.0.39
The votes cast were as follows: +1 (binding): rjung, yoav, markt +1 : violetagg No other votes were cast. The vote therefore passes. I'll move the bits to the release locations shortly and announce once the mirrors have had a chance to sync - probably tomorrow. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1638 - /dev/tomcat/tomcat-7/v7.0.39/ /release/tomcat/tomcat-7/v7.0.39/
Author: markt Date: Tue Mar 26 22:02:39 2013 New Revision: 1638 Log: Release Tomcat 7.0.39 Added: release/tomcat/tomcat-7/v7.0.39/ - copied from r1637, dev/tomcat/tomcat-7/v7.0.39/ Removed: dev/tomcat/tomcat-7/v7.0.39/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1638 - /dev/tomcat/tomcat-7/v7.0.39/ /release/tomcat/tomcat-7/v7.0.39/
Author: markt Date: Tue Mar 26 22:02:39 2013 New Revision: 1638 Log: Release Tomcat 7.0.39 Added: release/tomcat/tomcat-7/v7.0.39/ - copied from r1637, dev/tomcat/tomcat-7/v7.0.39/ Removed: dev/tomcat/tomcat-7/v7.0.39/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1461336 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Author: markt Date: Tue Mar 26 22:05:46 2013 New Revision: 1461336 URL: http://svn.apache.org/r1461336 Log: Just released the bits Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml 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=1461336&r1=1461335&r2=1461336&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Mar 26 22:05:46 2013 @@ -92,7 +92,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1461341 - in /tomcat/trunk/java/org/apache/tomcat/util/http/fileupload: FileDeleteStrategy.java disk/package-info.java
Author: markt
Date: Tue Mar 26 22:15:02 2013
New Revision: 1461341
URL: http://svn.apache.org/r1461341
Log:
Fix Javadoc errors
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileDeleteStrategy.java
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/disk/package-info.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileDeleteStrategy.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileDeleteStrategy.java?rev=1461341&r1=1461340&r2=1461341&view=diff
==
---
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileDeleteStrategy.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileDeleteStrategy.java
Tue Mar 26 22:15:02 2013
@@ -79,8 +79,8 @@ public class FileDeleteStrategy {
*
* This method is designed for subclasses to override.
* The implementation may return either false or an
IOException
- * when deletion fails. The {@link #delete(File)} and {@link
#deleteQuietly(File)}
- * methods will handle either response appropriately.
+ * when deletion fails. The {@link #deleteQuietly(File)} method will handle
+ * either response appropriately.
* A check has been made to ensure that the file will exist.
*
* This implementation uses {@link File#delete()}.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/disk/package-info.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/disk/package-info.java?rev=1461341&r1=1461340&r2=1461341&view=diff
==
---
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/disk/package-info.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/disk/package-info.java
Tue Mar 26 22:15:02 2013
@@ -18,20 +18,18 @@
/**
*
* A disk-based implementation of the
- * {@link org.apache.commons.fileupload.FileItem FileItem}
+ * {@link org.apache.tomcat.util.http.fileupload.FileItem FileItem}
* interface. This implementation retains smaller items in memory, while
* writing larger ones to disk. The threshold between these two is
* configurable, as is the location of files that are written to disk.
*
*
* In typical usage, an instance of
- * {@link org.apache.commons.fileupload.disk.DiskFileItemFactory
DiskFileItemFactory}
+ * {@link org.apache.tomcat.util.http.fileupload.disk.DiskFileItemFactory
DiskFileItemFactory}
* would be created, configured, and then passed to a
- * {@link org.apache.commons.fileupload.FileUpload FileUpload}
+ * {@link org.apache.tomcat.util.http.fileupload.FileUpload FileUpload}
* implementation such as
- * {@link org.apache.commons.fileupload.servlet.ServletFileUpload
ServletFileUpload}
- * or
- * {@link org.apache.commons.fileupload.portlet.PortletFileUpload
PortletFileUpload}.
+ * {@link
org.apache.tomcat.util.http.fileupload.servlet.ServletFileUpload
ServletFileUpload}.
*
*
* The following code fragment demonstrates this usage.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1461342 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/http/fileupload/ java/org/apache/tomcat/util/http/fileupload/FileDeleteStrategy.java java/org/apache/tomcat/util/http/fi
Author: markt
Date: Tue Mar 26 22:15:52 2013
New Revision: 1461342
URL: http://svn.apache.org/r1461342
Log:
Fix Javadoc errors
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/ (props
changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/FileDeleteStrategy.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/disk/package-info.java
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1461341
Propchange: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/
--
Merged /tomcat/trunk/java/org/apache/tomcat/util/http/fileupload:r1461341
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/FileDeleteStrategy.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/FileDeleteStrategy.java?rev=1461342&r1=1461341&r2=1461342&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/FileDeleteStrategy.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/FileDeleteStrategy.java
Tue Mar 26 22:15:52 2013
@@ -79,8 +79,8 @@ public class FileDeleteStrategy {
*
* This method is designed for subclasses to override.
* The implementation may return either false or an
IOException
- * when deletion fails. The {@link #delete(File)} and {@link
#deleteQuietly(File)}
- * methods will handle either response appropriately.
+ * when deletion fails. The {@link #deleteQuietly(File)} method will handle
+ * either response appropriately.
* A check has been made to ensure that the file will exist.
*
* This implementation uses {@link File#delete()}.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/disk/package-info.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/disk/package-info.java?rev=1461342&r1=1461341&r2=1461342&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/disk/package-info.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/disk/package-info.java
Tue Mar 26 22:15:52 2013
@@ -18,20 +18,18 @@
/**
*
* A disk-based implementation of the
- * {@link org.apache.commons.fileupload.FileItem FileItem}
+ * {@link org.apache.tomcat.util.http.fileupload.FileItem FileItem}
* interface. This implementation retains smaller items in memory, while
* writing larger ones to disk. The threshold between these two is
* configurable, as is the location of files that are written to disk.
*
*
* In typical usage, an instance of
- * {@link org.apache.commons.fileupload.disk.DiskFileItemFactory
DiskFileItemFactory}
+ * {@link org.apache.tomcat.util.http.fileupload.disk.DiskFileItemFactory
DiskFileItemFactory}
* would be created, configured, and then passed to a
- * {@link org.apache.commons.fileupload.FileUpload FileUpload}
+ * {@link org.apache.tomcat.util.http.fileupload.FileUpload FileUpload}
* implementation such as
- * {@link org.apache.commons.fileupload.servlet.ServletFileUpload
ServletFileUpload}
- * or
- * {@link org.apache.commons.fileupload.portlet.PortletFileUpload
PortletFileUpload}.
+ * {@link
org.apache.tomcat.util.http.fileupload.servlet.ServletFileUpload
ServletFileUpload}.
*
*
* The following code fragment demonstrates this usage.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1461349 - /tomcat/trunk/test/org/apache/catalina/connector/TestInputBuffer.java
Author: markt
Date: Tue Mar 26 22:26:37 2013
New Revision: 1461349
URL: http://svn.apache.org/r1461349
Log:
Speed up test, reduce errors reported in logs
Modified:
tomcat/trunk/test/org/apache/catalina/connector/TestInputBuffer.java
Modified: tomcat/trunk/test/org/apache/catalina/connector/TestInputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/connector/TestInputBuffer.java?rev=1461349&r1=1461348&r2=1461349&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/connector/TestInputBuffer.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/connector/TestInputBuffer.java Tue
Mar 26 22:26:37 2013
@@ -19,6 +19,7 @@ package org.apache.catalina.connector;
import java.io.IOException;
import java.io.Reader;
import java.io.Writer;
+import java.nio.charset.MalformedInputException;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
@@ -71,8 +72,8 @@ public class TestInputBuffer extends Tom
null);
if (expected == null) {
-Assert.assertEquals(description,
-HttpServletResponse.SC_INTERNAL_SERVER_ERROR, rc);
+Assert.assertEquals(description, HttpServletResponse.SC_OK, rc);
+Assert.assertEquals(description, "FAILED", bc.toString());
} else if (expected.length() == 0) {
Assert.assertNull(description, bc.toString());
} else {
@@ -103,13 +104,18 @@ public class TestInputBuffer extends Tom
resp.setContentType("text/plain");
Writer w = resp.getWriter();
-// Copy one character at a time
-int c = r.read();
-while (c != -1) {
-w.write(c);
-c = r.read();
+try {
+// Copy one character at a time
+int c = r.read();
+while (c != -1) {
+w.write(c);
+c = r.read();
+}
+w.close();
+} catch (MalformedInputException mie) {
+resp.resetBuffer();
+w.write("FAILED");
}
-w.close();
}
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1461351 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/connector/TestInputBuffer.java
Author: markt
Date: Tue Mar 26 22:27:19 2013
New Revision: 1461351
URL: http://svn.apache.org/r1461351
Log:
Speed up test, reduce errors reported in logs
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestInputBuffer.java
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1461349
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestInputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestInputBuffer.java?rev=1461351&r1=1461350&r2=1461351&view=diff
==
---
tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestInputBuffer.java
(original)
+++
tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestInputBuffer.java
Tue Mar 26 22:27:19 2013
@@ -19,6 +19,7 @@ package org.apache.catalina.connector;
import java.io.IOException;
import java.io.Reader;
import java.io.Writer;
+import java.nio.charset.MalformedInputException;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
@@ -71,8 +72,8 @@ public class TestInputBuffer extends Tom
null);
if (expected == null) {
-Assert.assertEquals(description,
-HttpServletResponse.SC_INTERNAL_SERVER_ERROR, rc);
+Assert.assertEquals(description, HttpServletResponse.SC_OK, rc);
+Assert.assertEquals(description, "FAILED", bc.toString());
} else if (expected.length() == 0) {
Assert.assertNull(description, bc.toString());
} else {
@@ -103,13 +104,18 @@ public class TestInputBuffer extends Tom
resp.setContentType("text/plain");
Writer w = resp.getWriter();
-// Copy one character at a time
-int c = r.read();
-while (c != -1) {
-w.write(c);
-c = r.read();
+try {
+// Copy one character at a time
+int c = r.read();
+while (c != -1) {
+w.write(c);
+c = r.read();
+}
+w.close();
+} catch (MalformedInputException mie) {
+resp.resetBuffer();
+w.write("FAILED");
}
-w.close();
}
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54756] EXCEPTION_ACCESS_VIOLATION with APR crashing Tomcat
https://issues.apache.org/bugzilla/show_bug.cgi?id=54756 --- Comment #4 from Sebb --- A bit more info from the crash log: the original cause of the crash is an access violation: Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code) C [tcnative-1.dll+0x52f0] Java_org_apache_tomcat_jni_Socket_send+0xa0 The thread that invoked the JNI code is as shown in comment 2. Ideally, it should not be possible to crash the JVM - whether that is by bugs in the JVM native code or in user-provided JNI code as is the case here. Seems to me it should be possible to fix tcnative so it does not generate this access violation. The calling code has likely violated an expected calling sequence or pre-condition, but IMO that should still not be able to cause an access violation. Rather, some kind of exception should be thrown & should give a clue as to what went wrong so the application can be more readily fixed. -- 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 54754] WebSocket endpoint servlet mappings shadowed by "/" mapping
https://issues.apache.org/bugzilla/show_bug.cgi?id=54754 --- Comment #6 from rstoyanc...@yahoo.com --- OK that makes sense. Thanks! -- 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 54756] EXCEPTION_ACCESS_VIOLATION with APR crashing Tomcat
https://issues.apache.org/bugzilla/show_bug.cgi?id=54756 --- Comment #5 from Chuck Caldarale --- (In reply to comment #4) > Ideally, it should not be possible to crash the JVM - whether that is by > bugs in the JVM native code or in user-provided JNI code as is the case here. Unfortunately, that's not true. Native code invoked by JNI has full access to the memory of the process, so it can scribble all over the Java heap, C heap, the stack of any thread, or any other writable bits and pieces. Get a bit of pointer arithmetic wrong or make use of a dead object and it's game over. However, since the problem does appear to be in tcnative, one has to presume it's fixable. This particular problem is attempting to read from address 0x0040, so I'm guessing the native code picked up a null pointer to something and is trying to look at offset 0x40 within the structure. Since this is using the relatively new WebSocket capability with APR, I would suspect some timing issue in socket handling. -- 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
[Tomcat Wiki] Trivial Update of "MarkusSqk" by MarkusSqk
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change notification. The "MarkusSqk" page has been changed by MarkusSqk: http://wiki.apache.org/tomcat/MarkusSqk New page: Not much to tell about me I think.<> Feels good to be a member of apache.org.<> I really hope I am useful in some way here.<> <> Feel free to visit my homepage :: [[http://getexbackacademy.com/get-him-back/how-to-get-an-ex-boyfriend-back-after-he-dumps-you/|how to get an ex boyfriend back after he dumps you]] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of "LocalBadContent" by ChuckCaldarale
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change notification. The "LocalBadContent" page has been changed by ChuckCaldarale: http://wiki.apache.org/tomcat/LocalBadContent?action=diff&rev1=103&rev2=104 freewebsitehosting\.com friends-hood\.com g0g\.net + getexbackacademy\.com getminecraftfree\.info google-seo-top\.com goldbetreview - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of "LocalBadContent" by ChuckCaldarale
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change notification. The "LocalBadContent" page has been changed by ChuckCaldarale: http://wiki.apache.org/tomcat/LocalBadContent?action=diff&rev1=104&rev2=105 (my)[\s]+(name|page|web|site|blog) coupon loans + tell\s+about\s+me youtube\.com ##--Apache/LocalBadContent - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of "LocalBadContent" by KonstantinKolinko
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change notification. The "LocalBadContent" page has been changed by KonstantinKolinko: http://wiki.apache.org/tomcat/LocalBadContent?action=diff&rev1=105&rev2=106 zx\.slave\.ca zyseo\.com # Temporary measures - (my)[\s]+(name|page|web|site|blog) + (my)[\s]+(name|page|web|site|blog|home) coupon loans tell\s+about\s+me - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
