[Bug 59377] New: Missing POST parameter
https://bz.apache.org/bugzilla/show_bug.cgi?id=59377
Bug ID: 59377
Summary: Missing POST parameter
Product: Tomcat 6
Version: 6.0.44
Hardware: Other
OS: Linux
Status: NEW
Severity: critical
Priority: P2
Component: Catalina
Assignee: dev@tomcat.apache.org
Reporter: 275379...@qq.com
Our server hosted in CentOS, running tomcat 6.0.44, randomly we got problems
with parameter lost via POST.
In the fronted, it writes:
$.post(url, {
templateId: some integer, non-null value,
data: some base64 encoded string
}, function (result) {
...
});
And, the server side reads
String sTemplateId = controller.getParameter("templateId");
Most of the time, it runs OK. But randomly returns null, with a not slight
probability.
I search this problem over the internet, found it started ever since almost 12
year age, and yet I met it.
Here's some relative talks:
http://www.tek-tips.com/viewthread.cfm?qid=810751
http://stackoverflow.com/questions/13560023/request-parameters-are-dropped-in-tomcat
http://grokbase.com/t/tomcat/users/0933d46htg/tomcat-w-apr-data-lost-in-http-post-request
http://tomcat.10.x6.nabble.com/Missing-Request-Parameters-td2018269.html
--
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 59377] Missing POST parameter
https://bz.apache.org/bugzilla/show_bug.cgi?id=59377 --- Comment #1 from mgrigorov --- Which JavaScript library do you use? $.post looks like jQuery but then all request parameters should be in 'data'. 'templateId' is something random and jQuery will just ignore it. I guess it works only in the cases when 'templateId' is also in the 'data'. -- 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 59377] Missing POST parameter
https://bz.apache.org/bugzilla/show_bug.cgi?id=59377 --- Comment #2 from Esmool <275379...@qq.com> --- (In reply to mgrigorov from comment #1) > Which JavaScript library do you use? $.post looks like jQuery but then all > request parameters should be in 'data'. 'templateId' is something random and > jQuery will just ignore it. I guess it works only in the cases when > 'templateId' is also in the 'data'. jQuery 1.11.1 $.post() is shorter wrap of $.ajax(), only $.ajax() need parameters put in field 'data'. The formal rule of $.post() looks like $.post(url, queryParams, callback, resutsDataType); the 'data' field in my case is only a customized post parameter wish to send, no other particular syntax meaning. It worked fine most of the time, so I believe this is not the key point. BTW, I noticed that when the server resulted in parameter lost, the client side will appear in pending(waiting response from server) for a longer time then normal. In my case, normal time is about 1 second, and 10+ seconds if it fails. -- 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 59377] Missing POST parameter
https://bz.apache.org/bugzilla/show_bug.cgi?id=59377 --- Comment #3 from mgrigorov --- Can you create a mini application that reproduces the problem? This will help debugging it! 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 59377] Missing POST parameter
https://bz.apache.org/bugzilla/show_bug.cgi?id=59377 --- Comment #4 from Esmool <275379...@qq.com> --- (In reply to mgrigorov from comment #3) > Can you create a mini application that reproduces the problem? > This will help debugging it! > Thanks! OK, later, after work. Thank you~ -- 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-tc7.0.x-test-nio (in module tomcat-7.0.x) 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-tc7.0.x-test-nio has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 4 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc7.0.x-test-nio : Tomcat 7.x, a web server implementing Java Servlet 3.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-nio/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp-src.jar. -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp.home. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/logs-NIO -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-NIO/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-nio/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-nio.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-nio (Type: Build) Work ended in a state of : Failed Elapsed: 30 mins 49 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dbase.path=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-build-libs -Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x -Dtest.temp=output/test-tmp-NIO -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar -Dexamples.sources.skip=true -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160426.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps -Dtest.excludePerformance=true -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x -Dexecute.test.apr=false -Dexe cute.test.bio=false -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160426-native-src.tar.gz -Dtest.reports=output/logs-NIO -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160426-native-src.tar.gz -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dexecute.test.nio=true -Dtest.accesslog=true -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20160426.jar -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-7.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/output/testclasses:/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/public/workspace/tomcat-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.
[Bug 52952] Improve ExtensionValidator handling for embedded scenarios
https://bz.apache.org/bugzilla/show_bug.cgi?id=52952 --- Comment #3 from Mark Thomas --- That should be fine. -- 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 59377] Missing POST parameter
https://bz.apache.org/bugzilla/show_bug.cgi?id=59377 Mark Thomas changed: What|Removed |Added Resolution|--- |INVALID Status|NEW |RESOLVED --- Comment #5 from Mark Thomas --- Bugzilla is not a support forum. This question belongs on the users' mailing list. -- 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: r1740969 - in /tomcat/trunk: java/org/apache/tomcat/util/net/ java/org/apache/tomcat/util/net/jsse/ webapps/docs/
Author: remm
Date: Tue Apr 26 09:02:06 2016
New Revision: 1740969
URL: http://svn.apache.org/viewvc?rev=1740969&view=rev
Log:
59295: Add support for using pem encoded certificates with JSSE SSL. Submitted
by Emmanuel Bourg with additional tweaks.
This will need another rather painful SSL docs update, once the change is
validated.
Added:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/PEMFile.java (with
props)
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings.properties
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties?rev=1740969&r1=1740968&r2=1740969&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties Tue
Apr 26 09:02:06 2016
@@ -121,6 +121,7 @@ sslHostConfig.certificateVerificationInv
sslHostConfig.certificate.notype=Multiple certificates were specified and at
least one is missing the required attribute type
sslHostConfig.mismatch=The property [{0}] was set on the SSLHostConfig named
[{1}] and is for connectors of type [{2}] but the SSLHostConfig is being used
with a connector of type [{3}]
sslHostConfig.prefix_missing=The protocol [{0}] was added to the list of
protocols on the SSLHostConfig named [{1}]. Check if a +/- prefix is missing.
+sslHostConfigCertificate.mismatch=The property [{0}] was set on the
SSLHostConfigCertificate named [{1}] and is for certificate storage type [{2}]
but the certificate is being used with a storage of type [{3}]
sslImplementation.cnfe= Unable to create SSLImplementation for class [{0}]
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java?rev=1740969&r1=1740968&r2=1740969&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
Tue Apr 26 09:02:06 2016
@@ -19,11 +19,17 @@ package org.apache.tomcat.util.net;
import java.util.HashSet;
import java.util.Set;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.net.openssl.ciphers.Authentication;
+import org.apache.tomcat.util.res.StringManager;
public class SSLHostConfigCertificate {
+private static final Log log =
LogFactory.getLog(SSLHostConfigCertificate.class);
+private static final StringManager sm =
StringManager.getManager(SSLHostConfigCertificate.class);
+
public static final Type DEFAULT_TYPE = Type.UNDEFINED;
static final String DEFAULT_KEYSTORE_PROVIDER =
@@ -53,6 +59,8 @@ public class SSLHostConfigCertificate {
private String certificateFile;
private String certificateKeyFile;
+// Certificate store type
+private StoreType storeType = null;
public SSLHostConfigCertificate() {
this(null, Type.UNDEFINED);
@@ -113,6 +121,7 @@ public class SSLHostConfigCertificate {
public void setCertificateKeystoreFile(String certificateKeystoreFile) {
sslHostConfig.setProperty(
"Certificate.certificateKeystoreFile",
SSLHostConfig.Type.JSSE);
+setStoreType("Certificate.certificateKeystoreFile",
StoreType.KEYSTORE);
this.certificateKeystoreFile = certificateKeystoreFile;
}
@@ -125,6 +134,7 @@ public class SSLHostConfigCertificate {
public void setCertificateKeystorePassword(String
certificateKeystorePassword) {
sslHostConfig.setProperty(
"Certificate.certificateKeystorePassword",
SSLHostConfig.Type.JSSE);
+setStoreType("Certificate.certificateKeystorePassword",
StoreType.KEYSTORE);
this.certificateKeystorePassword = certificateKeystorePassword;
}
@@ -137,6 +147,7 @@ public class SSLHostConfigCertificate {
public void setCertificateKeystoreProvider(String
certificateKeystoreProvider) {
sslHostConfig.setProperty(
"Certificate.certificateKeystoreProvider",
SSLHostConfig.Type.JSSE);
+setStoreType("Certificate.certificateKeystoreProvider",
StoreType.KEYSTORE);
this.certificateKeystoreProvider = certificateKeystoreProvider;
}
@@ -149,6 +160,7 @@ public class SSLHostConfigCertificate {
public void setCertificateKeystoreType(String certificateKeystoreType) {
Re: Tomcat unresponsive, and http acceptor thread disappearing
On 26/04/2016 06:07, Mihir Patel wrote: > *Ask/Comment:* First of all, It was disappointing to not find any > errors/log Any exceptions thrown at that point should be logged to standard out. Depending on how bad the error condition is, the JVM might not be able to manage that but such a situation would be pretty unusual. > So, at the very least, would it make sense > to swap ExceptionUtils.handleThrowable and log.error in last catch block so > that we do see at least error reported? No. The errors being discussed are typically fatal to the JVM. In many cases attempting to use the logging system would simply trigger more errors and possibly mask the original error. > Additionally, it doesn't make sense > to "end" the main acceptor thread, so we should report the error in logs > but continue accepting new threads. See above. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1740977 - /tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
Author: markt
Date: Tue Apr 26 09:32:15 2016
New Revision: 1740977
URL: http://svn.apache.org/viewvc?rev=1740977&view=rev
Log:
Align test implementation more closely with trunk to try and reduce instances
of Gump CI failures.
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java?rev=1740977&r1=1740976&r2=1740977&view=diff
==
---
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
(original)
+++
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
Tue Apr 26 09:32:15 2016
@@ -71,6 +71,9 @@ public class TestWsWebSocketContainer ex
private static final long TIMEOUT_MS = 5 * 1000;
private static final long MARGIN = 500;
+// 5s should be plenty but Gump can be a lot slower
+private static final long START_STOP_WAIT = 60 * 1000;
+
static {
StringBuilder sb = new StringBuilder(4096);
for (int i = 0; i < 4096; i++) {
@@ -345,9 +348,9 @@ public class TestWsWebSocketContainer ex
Exception exception = null;
try {
while (true) {
+lastSend = System.currentTimeMillis();
Future f = wsSession.getAsyncRemote().sendBinary(
ByteBuffer.wrap(MESSAGE_BINARY_4K));
-lastSend = System.currentTimeMillis();
f.get();
}
} catch (Exception e) {
@@ -356,8 +359,8 @@ public class TestWsWebSocketContainer ex
long timeout = System.currentTimeMillis() - lastSend;
-// Clear the server side block and prevent any further blocks to allow
-// the server to shutdown cleanly
+// Clear the server side block and prevent further blocks to allow the
+// server to shutdown cleanly
BlockingPojo.clearBlock();
// Close the client session, primarily to allow the
@@ -924,6 +927,9 @@ public class TestWsWebSocketContainer ex
Session s = connectToEchoServer(wsContainer, new EndpointA(), path);
+// One for the client, one for the server
+validateBackgroundProcessCount(2);
+
StringBuilder msg = new StringBuilder();
for (long i = 0; i < size; i++) {
msg.append('x');
@@ -931,7 +937,7 @@ public class TestWsWebSocketContainer ex
s.getBasicRemote().sendText(msg.toString());
-// Wait for up to 5 seconds for session to close
+// Wait for up to 5 seconds for the client session to open
boolean open = s.isOpen();
int count = 0;
while (open != expectOpen && count < 50) {
@@ -942,9 +948,30 @@ public class TestWsWebSocketContainer ex
Assert.assertEquals(Boolean.valueOf(expectOpen),
Boolean.valueOf(s.isOpen()));
+
+// Close the session if it is expected to be open
+if (expectOpen) {
+s.close();
+}
+
+// Ensure both server and client have shutdown
+validateBackgroundProcessCount(0);
}
+private void validateBackgroundProcessCount(int expected) throws Exception
{
+int count = 0;
+while (count < (START_STOP_WAIT / 100)) {
+if (BackgroundProcessManager.getInstance().getProcessCount() ==
expected) {
+break;
+}
+Thread.sleep(100);
+count++;
+}
+Assert.assertEquals(expected,
BackgroundProcessManager.getInstance().getProcessCount());
+
+}
+
@Test
public void testPerMessageDefalteClient01() throws Exception {
doTestPerMessageDefalteClient(MESSAGE_STRING_1, 1);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 59344] PEM file support for JSSE
https://bz.apache.org/bugzilla/show_bug.cgi?id=59344 --- Comment #12 from Remy Maucherat --- I have committed r1740969, with some additions to avoid configuration errors. I have not committed the new tests yet since the mixing with the OpenSSL flag still looks a bit suspicious. Also the documentation is not updated, so the BZ remains open. -- 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: r1740980 - /tomcat/trunk/test/org/apache/tomcat/websocket/WebSocketBaseTest.java
Author: markt
Date: Tue Apr 26 09:34:19 2016
New Revision: 1740980
URL: http://svn.apache.org/viewvc?rev=1740980&view=rev
Log:
Extend wait period to try and reduce instances of Gump CI failures.
Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/WebSocketBaseTest.java
Modified: tomcat/trunk/test/org/apache/tomcat/websocket/WebSocketBaseTest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/WebSocketBaseTest.java?rev=1740980&r1=1740979&r2=1740980&view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/websocket/WebSocketBaseTest.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/WebSocketBaseTest.java Tue
Apr 26 09:34:19 2016
@@ -32,7 +32,8 @@ public abstract class WebSocketBaseTest
// environments it will continue to run and break other tests that
check
// it has stopped.
int count = 0;
-while (count < 50) {
+// 5s should be plenty here but Gump can be a lot slower so allow 60s.
+while (count < 600) {
if (BackgroundProcessManager.getInstance().getProcessCount() == 0)
{
break;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1740981 - in /tomcat/tc8.5.x/trunk: ./ test/org/apache/tomcat/websocket/WebSocketBaseTest.java
Author: markt
Date: Tue Apr 26 09:34:49 2016
New Revision: 1740981
URL: http://svn.apache.org/viewvc?rev=1740981&view=rev
Log:
Extend wait period to try and reduce instances of Gump CI failures.
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/WebSocketBaseTest.java
Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 26 09:34:49 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740980
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/WebSocketBaseTest.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/WebSocketBaseTest.java?rev=1740981&r1=1740980&r2=1740981&view=diff
==
---
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/WebSocketBaseTest.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/WebSocketBaseTest.java
Tue Apr 26 09:34:49 2016
@@ -32,7 +32,8 @@ public abstract class WebSocketBaseTest
// environments it will continue to run and break other tests that
check
// it has stopped.
int count = 0;
-while (count < 50) {
+// 5s should be plenty here but Gump can be a lot slower so allow 60s.
+while (count < 600) {
if (BackgroundProcessManager.getInstance().getProcessCount() == 0)
{
break;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1740982 - in /tomcat/tc8.0.x/trunk: ./ test/org/apache/tomcat/websocket/WebSocketBaseTest.java
Author: markt Date: Tue Apr 26 09:35:07 2016 New Revision: 1740982 URL: http://svn.apache.org/viewvc?rev=1740982&view=rev Log: Extend wait period to try and reduce instances of Gump CI failures. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/WebSocketBaseTest.java Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Apr 26 09:35:07 2016 @@ -1,2 +1,2 @@ /tomcat/tc8.5.x/trunk:1735042,1737966 -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886 ,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657 592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1 666387,1666494,1666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-168452 7,1684549-1684550,1685556,1685591,1685739,1685744,1685772,1685816,1685826,1685891,1687242,1687261,1687268,1687340,1687544,1687551,1688563,1688841,1688878,165,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,1690011,1690021,1690054,1690080,1690209,1691134,1691487,1691813,1692744-1692747,1692849,1692894,1692896,1693088,1693105,1693429,1693461,1694058,1694111,1694290
svn commit: r1740983 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/tomcat/websocket/WebSocketBaseTest.java
Author: markt Date: Tue Apr 26 09:35:37 2016 New Revision: 1740983 URL: http://svn.apache.org/viewvc?rev=1740983&view=rev Log: Extend wait period to try and reduce instances of Gump CI failures. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/WebSocketBaseTest.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Apr 26 09:35:37 2016 @@ -1,3 +1,3 @@ /tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553 -1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702 744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1725974,1726171-1 726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726 -/tomcat/tc8.5.x/trunk:1735579,1736839,1737199,1737966,1738042,1738044,1738162,1738165,1738178,1739157,1739173,1739177,1739476,1740132,1740521,1740536,1740804,1740811 -/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,12
svn commit: r1740988 - /tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
Author: markt
Date: Tue Apr 26 09:49:37 2016
New Revision: 1740988
URL: http://svn.apache.org/viewvc?rev=1740988&view=rev
Log:
Align test implementation more closely with 8.0.x to try and reduce instances
of Gump CI failures.
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java?rev=1740988&r1=1740987&r2=1740988&view=diff
==
---
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
(original)
+++
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
Tue Apr 26 09:49:37 2016
@@ -73,6 +73,9 @@ public class TestWsWebSocketContainer ex
private static final long TIMEOUT_MS = 5 * 1000;
private static final long MARGIN = 500;
+// 5s should be plenty but Gump can be a lot slower
+private static final long START_STOP_WAIT = 60 * 1000;
+
static {
StringBuilder sb = new StringBuilder(4096);
for (int i = 0; i < 4096; i++) {
@@ -347,9 +350,9 @@ public class TestWsWebSocketContainer ex
Exception exception = null;
try {
while (true) {
+lastSend = System.currentTimeMillis();
Future f = wsSession.getAsyncRemote().sendBinary(
ByteBuffer.wrap(MESSAGE_BINARY_4K));
-lastSend = System.currentTimeMillis();
f.get();
}
} catch (Exception e) {
@@ -358,6 +361,9 @@ public class TestWsWebSocketContainer ex
long timeout = System.currentTimeMillis() - lastSend;
+// Clear the server side block and prevent further blocks to allow the
+// server to shutdown cleanly
+BlockingPojo.clearBlock();
// Close the client session, primarily to allow the
// BackgroundProcessManager to shut down.
@@ -387,7 +393,7 @@ public class TestWsWebSocketContainer ex
}
-private static volatile boolean timoutOnContainer = false;
+private static volatile boolean timeoutOnContainer = false;
private void doTestWriteTimeoutServer(boolean setTimeoutOnContainer)
throws Exception {
@@ -402,7 +408,7 @@ public class TestWsWebSocketContainer ex
* because the API uses classes and the tests really need access
* to the instances which simply isn't possible.
*/
-timoutOnContainer = setTimeoutOnContainer;
+timeoutOnContainer = setTimeoutOnContainer;
Tomcat tomcat = getTomcatInstance();
@@ -465,6 +471,8 @@ public class TestWsWebSocketContainer ex
(ServerContainer) sce.getServletContext().getAttribute(
Constants.SERVER_CONTAINER_SERVLET_CONTEXT_ATTRIBUTE);
try {
+// Reset blocking state
+BlockingPojo.resetBlock();
sc.addEndpoint(BlockingPojo.class);
} catch (DeploymentException e) {
throw new IllegalStateException(e);
@@ -475,11 +483,35 @@ public class TestWsWebSocketContainer ex
@ServerEndpoint("/block")
public static class BlockingPojo {
+
+private static Object monitor = new Object();
+// Enable blockign by default
+private static boolean block = true;
+
+/**
+ * Clear any current block.
+ */
+public static void clearBlock() {
+synchronized (monitor) {
+BlockingPojo.block = false;
+monitor.notifyAll();
+}
+}
+
+public static void resetBlock() {
+synchronized (monitor) {
+block = true;
+}
+}
@SuppressWarnings("unused")
@OnMessage
public void echoTextMessage(Session session, String msg, boolean last)
{
try {
-Thread.sleep(6);
+synchronized (monitor) {
+while (block) {
+monitor.wait();
+}
+}
} catch (InterruptedException e) {
// Ignore
}
@@ -491,7 +523,11 @@ public class TestWsWebSocketContainer ex
public void echoBinaryMessage(Session session, ByteBuffer msg,
boolean last) {
try {
-Thread.sleep(TIMEOUT_MS * 10);
+synchronized (monitor) {
+while (block) {
+monitor.wait();
+}
+}
} catch (InterruptedException e) {
// Ignore
}
@@ -529,7 +565,7 @@ public class TestWsWebSocketContainer ex
exception = null;
r
[VOTE][RESULT] Release Apache Tomcat Native 1.2.6
The following votes were cast: Binding: +1: markt, rjung, remm No other votes were cast. The vote therefore passes. Thanks to everyone who contributed towards this release. I'll move the files to dist and announce once the mirrors have sync'd. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r13425 - /dev/tomcat/tomcat-connectors/native/1.2.6/ /release/tomcat/tomcat-connectors/native/1.2.6/ /release/tomcat/tomcat-connectors/native/README.html
Author: markt Date: Tue Apr 26 10:01:21 2016 New Revision: 13425 Log: Release tc-native 1.2.6 Added: release/tomcat/tomcat-connectors/native/1.2.6/ - copied from r13383, dev/tomcat/tomcat-connectors/native/1.2.6/ Removed: dev/tomcat/tomcat-connectors/native/1.2.6/ Modified: release/tomcat/tomcat-connectors/native/README.html Modified: release/tomcat/tomcat-connectors/native/README.html == --- release/tomcat/tomcat-connectors/native/README.html (original) +++ release/tomcat/tomcat-connectors/native/README.html Tue Apr 26 10:01:21 2016 @@ -1,5 +1,6 @@ The Apache Tomcat Native -Current release version is 1.1.33. +The latest release version is 1.2.6. +The latest release version for 1.1.x is 1.1.34 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1740991 - /tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
Author: markt
Date: Tue Apr 26 10:22:40 2016
New Revision: 1740991
URL: http://svn.apache.org/viewvc?rev=1740991&view=rev
Log:
Add a (currently disabled) test for BZ 59317
Modified:
tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
Modified: tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java?rev=1740991&r1=1740990&r2=1740991&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java Tue
Apr 26 10:22:40 2016
@@ -18,6 +18,8 @@ package org.apache.catalina.core;
import java.io.IOException;
import java.io.PrintWriter;
+import java.net.URI;
+import java.net.URISyntaxException;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
@@ -48,6 +50,7 @@ import static org.junit.Assert.assertNot
import static org.junit.Assert.assertTrue;
import org.junit.Assert;
+import org.junit.Ignore;
import org.junit.Test;
import org.apache.catalina.Context;
@@ -2478,4 +2481,59 @@ public class TestAsyncContextImpl extend
ac.setErrorState(new Exception(), true);
ac.fireOnComplete();
}
+
+/*
+ * https://bz.apache.org/bugzilla/show_bug.cgi?id=59317
+ */
+@Ignore // Currently fails. Disabled while investigations continue.
+@Test
+public void testAsyncDistachUrlWithSpaces() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+Context context = tomcat.addContext("", null);
+Servlet s = new AsyncDispatchUrlWithSpacesServlet();
+Wrapper w = Tomcat.addServlet(context, "space", s);
+w.setAsyncSupported(true);
+context.addServletMapping("/space/*", "space");
+tomcat.start();
+
+ByteChunk responseBody = new ByteChunk();
+int rc = getUrl("http://localhost:"; + getPort() +
"/sp%61ce/foo%20bar", responseBody, null);
+
+Assert.assertEquals(200, rc);
+}
+
+
+private static class AsyncDispatchUrlWithSpacesServlet extends HttpServlet
{
+
+private static final long serialVersionUID = 1L;
+
+@Override
+protected void doGet(HttpServletRequest req, HttpServletResponse resp)
+throws ServletException, IOException {
+
+Integer countObj = (Integer) req.getAttribute("count");
+int count = 0;
+if (countObj != null) {
+count = countObj.intValue();
+}
+count++;
+req.setAttribute("count", Integer.valueOf(count));
+
+try {
+// Just here to trigger the error
+@SuppressWarnings("unused")
+URI u = new URI(req.getRequestURI());
+} catch (URISyntaxException e) {
+throw new ServletException(e);
+}
+
+if (count > 3) {
+resp.setContentType("text/plain");
+resp.getWriter().print("OK");
+} else {
+AsyncContext ac = req.startAsync();
+ac.dispatch("/sp%61ce/foo%20bar");
+}
+}
+}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1740997 - /tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
Author: markt
Date: Tue Apr 26 10:53:04 2016
New Revision: 1740997
URL: http://svn.apache.org/viewvc?rev=1740997&view=rev
Log:
Tweak formatting. Fix an IDE nit.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java?rev=1740997&r1=1740996&r2=1740997&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
Tue Apr 26 10:53:04 2016
@@ -239,6 +239,8 @@ public class SSLHostConfigCertificate {
}
}
-private static enum StoreType { KEYSTORE, PEM };
-
+private static enum StoreType {
+KEYSTORE,
+PEM
+}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1740997 - /tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
Le 26/04/2016 12:53, ma...@apache.org a écrit :
> Modified:
> tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java?rev=1740997&r1=1740996&r2=1740997&view=diff
> ==
> ---
> tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
> (original)
> +++
> tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
> Tue Apr 26 10:53:04 2016
> @@ -239,6 +239,8 @@ public class SSLHostConfigCertificate {
> }
> }
>
> -private static enum StoreType { KEYSTORE, PEM };
> -
> +private static enum StoreType {
> +KEYSTORE,
> +PEM
> +}
> }
The static keyword could be removed too, inner enums are implicitly
static (IntelliJ complains about it). There are ~20 enums in other
classes declared static too.
Emmanuel Bourg
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 59317] AsyncContextImpl breaks request URL containing spaces
https://bz.apache.org/bugzilla/show_bug.cgi?id=59317 --- Comment #2 from Mark Thomas --- A few more notes as I investigate this. Async and non-async behaviours are currently the same. - Both expect the path used to obtain the dispatcher to be decoded. This behavior was confirmed with the Servlet EG. - Both return the unencoded URI for req.getRequestURI(). That strikes me as wrong. -- 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 57559] Decoded Request URI used for Asynchronous dispatch
https://bz.apache.org/bugzilla/show_bug.cgi?id=57559 --- Comment #6 from Mark Thomas --- This time actually add the link. https://java.net/projects/servlet-spec/lists/jsr369-experts/archive/2015-02/message/18 -- 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: r1741015 - in /tomcat/trunk: java/org/apache/catalina/core/ApplicationContext.java test/org/apache/catalina/core/TestAsyncContextImpl.java webapps/docs/changelog.xml
Author: markt
Date: Tue Apr 26 13:20:32 2016
New Revision: 1741015
URL: http://svn.apache.org/viewvc?rev=1741015&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=59317
After a dispatch (async and non-async) ensure that getRequestURI() returns an
encoded URI.
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1741015&r1=1741014&r2=1741015&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java Tue Apr
26 13:20:32 2016
@@ -65,6 +65,7 @@ import org.apache.catalina.Wrapper;
import org.apache.catalina.connector.Connector;
import org.apache.catalina.mapper.MappingData;
import org.apache.catalina.util.ServerInfo;
+import org.apache.catalina.util.URLEncoder;
import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.buf.CharChunk;
import org.apache.tomcat.util.buf.MessageBytes;
@@ -465,11 +466,11 @@ public class ApplicationContext
mappingData.recycle();
-// Construct a RequestDispatcher to process this request
-return new ApplicationDispatcher
-(wrapper, uriCC.toString(), wrapperPath, pathInfo,
- queryString, mapping, null);
+String encodedUri = URLEncoder.DEFAULT.encode(uriCC.toString());
+// Construct a RequestDispatcher to process this request
+return new ApplicationDispatcher(wrapper, encodedUri, wrapperPath,
pathInfo,
+queryString, mapping, null);
}
Modified: tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java?rev=1741015&r1=1741014&r2=1741015&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java Tue
Apr 26 13:20:32 2016
@@ -50,7 +50,6 @@ import static org.junit.Assert.assertNot
import static org.junit.Assert.assertTrue;
import org.junit.Assert;
-import org.junit.Ignore;
import org.junit.Test;
import org.apache.catalina.Context;
@@ -62,6 +61,7 @@ import org.apache.catalina.startup.Tomca
import org.apache.catalina.valves.TesterAccessLogValve;
import org.apache.tomcat.unittest.TesterContext;
import org.apache.tomcat.util.buf.ByteChunk;
+import org.apache.tomcat.util.buf.UDecoder;
import org.apache.tomcat.util.descriptor.web.ErrorPage;
import org.easymock.EasyMock;
@@ -2240,11 +2240,10 @@ public class TestAsyncContextImpl extend
tomcat.start();
String uri = "/foo/%24/bar";
-String uriDecoded = "/foo/$/bar";
ByteChunk body = getUrl("http://localhost:"; + getPort()+ uri);
-Assert.assertEquals(uriDecoded, body.toString());
+Assert.assertEquals(uri, body.toString());
}
private static class AsyncRequestUriServlet extends HttpServlet {
@@ -2482,17 +2481,32 @@ public class TestAsyncContextImpl extend
ac.fireOnComplete();
}
+
/*
* https://bz.apache.org/bugzilla/show_bug.cgi?id=59317
*/
-@Ignore // Currently fails. Disabled while investigations continue.
@Test
-public void testAsyncDistachUrlWithSpaces() throws Exception {
+public void testAsyncDispatchUrlWithSpaces() throws Exception {
+doTestDispatchWithSpaces(true);
+}
+
+
+@Test
+public void testForwardDispatchUrlWithSpaces() throws Exception {
+doTestDispatchWithSpaces(false);
+}
+
+
+private void doTestDispatchWithSpaces(boolean async) throws Exception {
Tomcat tomcat = getTomcatInstance();
Context context = tomcat.addContext("", null);
-Servlet s = new AsyncDispatchUrlWithSpacesServlet();
-Wrapper w = Tomcat.addServlet(context, "space", s);
-w.setAsyncSupported(true);
+if (async) {
+Servlet s = new AsyncDispatchUrlWithSpacesServlet();
+Wrapper w = Tomcat.addServlet(context, "space", s);
+w.setAsyncSupported(true);
+} else {
+Tomcat.addServlet(context, "space", new
ForwardDispatchUrlWithSpacesServlet());
+}
context.addServletMapping("/space/*", "space");
tomcat.start();
@@ -2519,10 +2533,13 @@ public class TestAsyncContextImpl extend
count++;
req.setAttribute("count", Integer.valueOf(count));
+String encodedUri = req.getRequestURI();
+String decodedUri
svn commit: r1741018 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/core/ApplicationContext.java test/org/apache/catalina/core/TestAsyncContextImpl.java webapps/docs/changelog.xml
Author: markt Date: Tue Apr 26 13:22:21 2016 New Revision: 1741018 URL: http://svn.apache.org/viewvc?rev=1741018&view=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=59317 After a dispatch (async and non-async) ensure that getRequestURI() returns an encoded URI. Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContext.java tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Apr 26 13:22:21 2016 @@ -1 +1 @@ -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740980 +/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740980,1740991,1741015 Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContext.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1741018&r1=1741017&r2=1741018&view=diff == --- tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContext.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContext.java Tue Apr 26 13:22:21 2016 @@ -65,6 +65,7 @@ import org.apache.catalina.connector.Con import org.apache.catalina.mapper.MappingData; import org.apache.catalina.servlet4preview.http.Mapping; import org.apache.catalina.util.ServerInfo; +import org.apache.catalina.util.URLEncoder; import org.apache.tomcat.util.ExceptionUtils; import org.apache.tomcat.util.buf.CharChunk; import org.apache.tomcat.util.buf.MessageBytes; @@ -465,11 +466,11 @@ public class ApplicationContext mappingData.recycle(); -// Construct a RequestDispatcher to process this request -return new ApplicationDispatcher -(wrapper, uriCC.toString(), wrapperPath, pathInfo, - queryString, mapping, null); +String encodedUri = URLEncoder.DEFAULT.encode(uriCC.toString()); +// Construct a RequestDispatcher to process this request +return new ApplicationDispatcher(wrapper, encodedUri, wrapperPath, pathInfo, +queryString, mapping, null); } Modified: tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java?rev=1741018&r1=1741017&r2=1741018&view=diff == --- tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java (original) +++ tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java Tue Apr 26 13:22:21 2016 @@ -18,6 +18,8 @@ package org.apache.catalina.core; import java.io.IOException; import java.io.PrintWriter; +import java.net.URI; +import java.net.URISyntaxException; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; @@ -59,6 +61,7 @@ import org.apache.catalina.startup.Tomca import org.apache.catalina.valves.TesterAccessLogValve; import org.apache.tomcat.unittest.TesterContext; import org.apache.tomcat.util.buf.ByteChunk; +import org.apache.tomcat.util.buf.UDecoder; import org.apache.tomcat.util.descriptor.web.ErrorPage; import org.easymock.EasyMock; @@ -2237,11
svn commit: r1741019 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/core/ApplicationContext.java test/org/apache/catalina/core/TestAsyncContextImpl.java webapps/docs/changelog.xml
Author: markt Date: Tue Apr 26 13:28:12 2016 New Revision: 1741019 URL: http://svn.apache.org/viewvc?rev=1741019&view=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=59317 After a dispatch (async and non-async) ensure that getRequestURI() returns an encoded URI. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Apr 26 13:28:12 2016 @@ -1,2 +1,2 @@ /tomcat/tc8.5.x/trunk:1735042,1737966 -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886 ,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657 592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1 666387,1666494,1666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-168452 7,1684549-1684550,1685556,1685591,1685739,1685744,1685772,1685816,1685826,1685891,1687242,1687261,1687268,1687340,1687544,1687551,1688563,1688841,1688878,165,1688896,1688901,1689345-1689346,1689357,1689656,168
svn commit: r1741024 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/ApplicationContext.java java/org/apache/catalina/util/URLEncoder.java test/org/apache/catalina/core/TestAsyncContextIm
Author: markt Date: Tue Apr 26 13:39:16 2016 New Revision: 1741024 URL: http://svn.apache.org/viewvc?rev=1741024&view=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=59317 After a dispatch (async and non-async) ensure that getRequestURI() returns an encoded URI. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/util/URLEncoder.java tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Apr 26 13:39:16 2016 @@ -1,3 +1,3 @@ -/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553 -1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702 744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1725974,1726171-1 726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726 +/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757
[Bug 59317] AsyncContextImpl breaks request URL containing spaces
https://bz.apache.org/bugzilla/show_bug.cgi?id=59317 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #3 from Mark Thomas --- The restriction the the request dispatcher (or the async dispatch) must be obtained with a decoded path has not changed. However, I have applied a fix that ensures that the result of the call to getRequestURI() after the dispatch returned an encoded URI. This has been fixed in: 9.0.x for 9.0.0.M5 onwards 8.5.x for 8.5.1 onwards 8.0.x for 8.0.34 onwards 7.0.x for 7.0.70 onwards -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1741033 - /tomcat/trunk/build.properties.default
Author: markt
Date: Tue Apr 26 14:11:22 2016
New Revision: 1741033
URL: http://svn.apache.org/viewvc?rev=1741033&view=rev
Log:
Update to latest tc-native
Modified:
tomcat/trunk/build.properties.default
Modified: tomcat/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1741033&r1=1741032&r2=1741033&view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Tue Apr 26 14:11:22 2016
@@ -154,7 +154,7 @@ jdt.loc.1=http://archive.eclipse.org/ecl
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
# - Tomcat native library -
-tomcat-native.version=1.2.5
+tomcat-native.version=1.2.6
tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1741036 - /tomcat/trunk/webapps/docs/changelog.xml
Author: markt Date: Tue Apr 26 14:16:23 2016 New Revision: 1741036 URL: http://svn.apache.org/viewvc?rev=1741036&view=rev 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=1741036&r1=1741035&r2=1741036&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Tue Apr 26 14:16:23 2016 @@ -314,6 +314,11 @@ 59280: Update the NSIS Installer used to build the Windows Installers to version 2.51. (kkolinko) + +Update the packaged version of the Tomcat Native Library to 1.2.6 to +pick up the Windows binaries that are based on OpenSSL 1.0.2g and APR +1.5.2. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 59334] .NET Application Pools requests hang because Jakarta/Tomcat uses a Named Mutex that is currently owned by a different process
https://bz.apache.org/bugzilla/show_bug.cgi?id=59334 --- Comment #4 from Murilo --- Adding more information, we've tried with versions 1.2.30 and 1.2.36 to see if that would help, but 1.2.30 made it worse, as the app pools would crash all the time, and 1.2.36 presents the same issues as 1.2.40 in terms of hanging the other app pools. Appreciate if anyone has any update on this. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1741058 - in /tomcat/trunk: java/org/apache/tomcat/util/net/jsse/JSSEUtil.java java/org/apache/tomcat/util/net/jsse/LocalStrings.properties webapps/docs/config/http.xml
Author: remm
Date: Tue Apr 26 17:03:04 2016
New Revision: 1741058
URL: http://svn.apache.org/viewvc?rev=1741058&view=rev
Log:
Doc review: if the private key PEM isn't set, it should look into the
certificate PEM. The PEM parser appears to handle that as well.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings.properties
tomcat/trunk/webapps/docs/config/http.xml
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java?rev=1741058&r1=1741057&r2=1741058&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java Tue Apr 26
17:03:04 2016
@@ -287,10 +287,9 @@ public class JSSEUtil extends SSLUtilBas
ks = KeyStore.getInstance("JKS");
ks.load(null, null);
-if (certificate.getCertificateKeyFile() == null) {
-throw new
IllegalStateException(sm.getString("jsse.noPrivateKey"));
-}
-PEMFile privateKeyFile = new
PEMFile(SSLHostConfig.adjustRelativePath(certificate.getCertificateKeyFile()),
keyPass);
+PEMFile privateKeyFile = new
PEMFile(SSLHostConfig.adjustRelativePath
+(certificate.getCertificateKeyFile() != null ?
certificate.getCertificateKeyFile() : certificate.getCertificateFile()),
+keyPass);
PEMFile certificateFile = new
PEMFile(SSLHostConfig.adjustRelativePath(certificate.getCertificateFile()));
Collection chain = new ArrayList<>();
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings.properties?rev=1741058&r1=1741057&r2=1741058&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings.properties
Tue Apr 26 17:03:04 2016
@@ -25,8 +25,7 @@ jsse.excludeDefaultProtocol=The SSL prot
jsse.noDefaultCiphers=Unable to determine a default for ciphers for [{0}]. Set
an explicit value to ensure the connector can start.
jsse.noDefaultProtocols=Unable to determine a default for sslEnabledProtocols.
Set an explicit value to ensure the connector can start.
jsse.exceptionOnClose=Failure to close socket.
-jsse.noPrivateKey=No private key specified for certificate.
-jsse.pemParseError=Unable to parse the private key from [{0}]
+jsse.pemParseError=Unable to parse the key from [{0}]
jsseSupport.clientCertError=Error trying to obtain a certificate from the
client
jseeSupport.certTranslationError=Error translating certificate [{0}]
Modified: tomcat/trunk/webapps/docs/config/http.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/http.xml?rev=1741058&r1=1741057&r2=1741058&view=diff
==
--- tomcat/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/trunk/webapps/docs/config/http.xml Tue Apr 26 17:03:04 2016
@@ -1255,7 +1255,6 @@
- OpenSSL only.
Name of the file that contains the server certificate. The format is
PEM-encoded. Relative paths will be resolved against
$CATALINA_BASE.
@@ -1267,7 +1266,6 @@
- OpenSSL only.
Name of the file that contains the certificate chain associated with
the server certificate used. The format is
PEM-encoded. Relative paths will be resolved against
@@ -1290,7 +1288,6 @@
- OpenSSL only.
Name of the file that contains the server private key. The format is
PEM-encoded. The default value is the value of
certificateFile and in this case both certificate and
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1741060 - /tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
Author: remm
Date: Tue Apr 26 17:07:52 2016
New Revision: 1741060
URL: http://svn.apache.org/viewvc?rev=1741060&view=rev
Log:
Remove useless static keyword.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java?rev=1741060&r1=1741059&r2=1741060&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
Tue Apr 26 17:07:52 2016
@@ -239,7 +239,7 @@ public class SSLHostConfigCertificate {
}
}
-private static enum StoreType {
+private enum StoreType {
KEYSTORE,
PEM
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1741061 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/util/net/ java/org/apache/tomcat/util/net/jsse/ webapps/docs/ webapps/docs/config/
Author: remm
Date: Tue Apr 26 17:09:16 2016
New Revision: 1741061
URL: http://svn.apache.org/viewvc?rev=1741061&view=rev
Log:
59295: Add support for using pem encoded certificates with JSSE SSL. Submitted
by Emmanuel Bourg with additional tweaks.
Added:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/jsse/PEMFile.java
- copied unchanged from r1740969,
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/PEMFile.java
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings.properties
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
tomcat/tc8.5.x/trunk/webapps/docs/config/http.xml
Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 26 17:09:16 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740980,1740991,1741015
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741058,1741060
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties?rev=1741061&r1=1741060&r2=1741061&view=diff
==
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
Tue Apr 26 17:09:16 2016
@@ -122,6 +122,7 @@ sslHostConfig.certificateVerificationInv
sslHostConfig.certificate.notype=Multiple certificates were specified and at
least one is missing the required attribute type
sslHostConfig.mismatch=The property [{0}] was set on the SSLHostConfig named
[{1}] and is for connectors of type [{2}] but the SSLHostConfig is being used
with a connector of type [{3}]
sslHostConfig.prefix_missing=The protocol [{0}] was added to the list of
protocols on the SSLHostConfig named [{1}]. Check if a +/- prefix is missing.
+sslHostConfigCertificate.mismatch=The property [{0}] was set on the
SSLHostConfigCertificate named [{1}] and is for certificate storage type [{2}]
but the certificate is being used with a storage of type [{3}]
sslImplementation.cnfe= Unable to create SSLImplementation for class [{0}]
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java?rev=1741061&r1=1741060&r2=1741061&view=diff
==
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
Tue Apr 26 17:09:16 2016
@@ -19,11 +19,17 @@ package org.apache.tomcat.util.net;
import java.util.HashSet;
import java.util.Set;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.net.openssl.ciphers.Authentication;
+import org.apache.tomcat.util.res.StringManager;
[Bug 59344] PEM file support for JSSE
https://bz.apache.org/bugzilla/show_bug.cgi?id=59344 Remy Maucherat changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #13 from Remy Maucherat --- The docs doesn't look too bad. The feature will be in 9M5 and 8.5.1, but you really should look into using OpenSSL if you want to do something useful with these new Tomcats. -- 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: r1741080 - in /tomcat/trunk: java/org/apache/catalina/core/AprLifecycleListener.java java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java webapps/docs/changelog.xml
Author: markt
Date: Tue Apr 26 19:17:55 2016
New Revision: 1741080
URL: http://svn.apache.org/viewvc?rev=1741080&view=rev
Log:
Make the TLS certificate chain available to clients when using JSSE+OpenSSL
with the certificate chain stored in a Java KeyStore.
Modified:
tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java?rev=1741080&r1=1741079&r2=1741080&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java Tue
Apr 26 19:17:55 2016
@@ -66,9 +66,9 @@ public class AprLifecycleListener
protected static final int TCN_REQUIRED_MAJOR = 1;
protected static final int TCN_REQUIRED_MINOR = 2;
-protected static final int TCN_REQUIRED_PATCH = 2;
+protected static final int TCN_REQUIRED_PATCH = 6;
protected static final int TCN_RECOMMENDED_MINOR = 2;
-protected static final int TCN_RECOMMENDED_PV = 2;
+protected static final int TCN_RECOMMENDED_PV = 6;
// -- Properties
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java?rev=1741080&r1=1741079&r2=1741080&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
Tue Apr 26 19:17:55 2016
@@ -273,14 +273,9 @@ public class OpenSSLContext implements o
sb.append(Base64.getMimeEncoder(64, new byte[]
{'\n'}).encodeToString(key.getEncoded()));
sb.append(END_KEY);
SSLContext.setCertificateRaw(ctx, chain[0].getEncoded(),
sb.toString().getBytes(StandardCharsets.US_ASCII), SSL.SSL_AIDX_RSA);
-/*
- * Uncomment the code block below once there has been a
tc-native
- * release with this method and the minimum tc-native version
- * has been incremented.
for (int i = 1; i < chain.length; i++) {
SSLContext.addChainCertificateRaw(ctx,
chain[i].getEncoded());
}
-*/
}
// Client certificate verification
int value = 0;
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1741080&r1=1741079&r2=1741080&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Apr 26 19:17:55 2016
@@ -209,6 +209,11 @@
59295: Add support for using pem encoded certificates with
JSSE SSL. Submitted by Emmanuel Bourg with additional tweaks. (remm)
+
+Make the TLS certificate chain available to clients when using
+JSSE+OpenSSL with the certificate chain stored in a Java KeyStore.
+(markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1741081 - in /tomcat/tc8.5.x/trunk: ./ build.properties.default webapps/docs/changelog.xml
Author: markt
Date: Tue Apr 26 19:18:49 2016
New Revision: 1741081
URL: http://svn.apache.org/viewvc?rev=1741081&view=rev
Log:
Update to latest tc-native
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/build.properties.default
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 26 19:18:49 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741058,1741060
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060
Modified: tomcat/tc8.5.x/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/build.properties.default?rev=1741081&r1=1741080&r2=1741081&view=diff
==
--- tomcat/tc8.5.x/trunk/build.properties.default (original)
+++ tomcat/tc8.5.x/trunk/build.properties.default Tue Apr 26 19:18:49 2016
@@ -154,7 +154,7 @@ jdt.loc.1=http://archive.eclipse.org/ecl
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
# - Tomcat native library -
-tomcat-native.version=1.2.5
+tomcat-native.version=1.2.6
tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1741081&r1=1741080&r2=1741081&view=diff
==
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Tue Apr 26 19:18:49 2016
@@ -321,6 +321,11 @@
59280: Update the NSIS Installer used to build the
Windows Installers to version 2.51. (kkolinko)
+
+Update the packaged version of the Tomcat Native Library to 1.2.6 to
+pick up the Windows binaries that are based on OpenSSL 1.0.2g and APR
+1.5.2. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1741082 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/core/AprLifecycleListener.java java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java webapps/docs/changelog.xml
Author: markt
Date: Tue Apr 26 19:19:14 2016
New Revision: 1741082
URL: http://svn.apache.org/viewvc?rev=1741082&view=rev
Log:
Make the TLS certificate chain available to clients when using JSSE+OpenSSL
with the certificate chain stored in a Java KeyStore.
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 26 19:19:14 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java?rev=1741082&r1=1741081&r2=1741082&view=diff
==
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
Tue Apr 26 19:19:14 2016
@@ -66,9 +66,9 @@ public class AprLifecycleListener
protected static final int TCN_REQUIRED_MAJOR = 1;
protected static final int TCN_REQUIRED_MINOR = 2;
-protected static final int TCN_REQUIRED_PATCH = 2;
+protected static final int TCN_REQUIRED_PATCH = 6;
protected static final int TCN_RECOMMENDED_MINOR = 2;
-protected static final int TCN_RECOMMENDED_PV = 2;
+protected static final int TCN_RECOMMENDED_PV = 6;
// -- Properties
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java?rev=1741082&r1=1741081&r2=1741082&view=diff
==
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
Tue Apr 26 19:19:14 2016
@@ -282,14 +282,9 @@ public class OpenSSLContext implements o
sb.append(encoded);
sb.append(END_KEY);
SSLContext.setCertificateRaw(ctx, chain[0].getEncoded(),
sb.toString().getBytes(StandardCharsets.US_ASCII), SSL.SSL_AIDX_RSA);
-/*
- * Uncomment the code block below once there has been a
tc-native
- * release with this method and the minimum tc-native version
- * has been incremented.
for (int i = 1; i < chain.length; i++) {
SSLContext.addChainCertificateRaw(ctx,
chain[i].getEncoded());
}
-*/
}
// Client certificate verification
int value = 0;
Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1741082&r1=1741081&r2=
svn commit: r1741084 - in /tomcat/native/trunk: build.properties.default native/include/tcn_version.h native/os/win32/libtcnative.rc xdocs/miscellaneous/changelog.xml
Author: markt
Date: Tue Apr 26 19:22:25 2016
New Revision: 1741084
URL: http://svn.apache.org/viewvc?rev=1741084&view=rev
Log:
Prep for next development cycle
Modified:
tomcat/native/trunk/build.properties.default
tomcat/native/trunk/native/include/tcn_version.h
tomcat/native/trunk/native/os/win32/libtcnative.rc
tomcat/native/trunk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/native/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/build.properties.default?rev=1741084&r1=1741083&r2=1741084&view=diff
==
--- tomcat/native/trunk/build.properties.default (original)
+++ tomcat/native/trunk/build.properties.default Tue Apr 26 19:22:25 2016
@@ -18,7 +18,7 @@
# - Version Control Flags -
version.major=1
version.minor=2
-version.build=6
+version.build=7
version.patch=0
version.suffix=-dev
Modified: tomcat/native/trunk/native/include/tcn_version.h
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/include/tcn_version.h?rev=1741084&r1=1741083&r2=1741084&view=diff
==
--- tomcat/native/trunk/native/include/tcn_version.h (original)
+++ tomcat/native/trunk/native/include/tcn_version.h Tue Apr 26 19:22:25 2016
@@ -63,7 +63,7 @@ extern "C" {
#define TCN_MINOR_VERSION 2
/** patch level */
-#define TCN_PATCH_VERSION 6
+#define TCN_PATCH_VERSION 7
/**
* This symbol is defined for internal, "development" copies of TCN. This
Modified: tomcat/native/trunk/native/os/win32/libtcnative.rc
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/os/win32/libtcnative.rc?rev=1741084&r1=1741083&r2=1741084&view=diff
==
--- tomcat/native/trunk/native/os/win32/libtcnative.rc (original)
+++ tomcat/native/trunk/native/os/win32/libtcnative.rc Tue Apr 26 19:22:25 2016
@@ -20,7 +20,7 @@ LANGUAGE 0x9,0x1
"See the License for the specific language governing " \
"permissions and limitations under the License."
-#define TCN_VERSION "1.2.6"
+#define TCN_VERSION "1.2.7"
1000 ICON "apache.ico"
1001 DIALOGEX 0, 0, 252, 51
@@ -36,8 +36,8 @@ BEGIN
END
1 VERSIONINFO
- FILEVERSION 1,2,6,0
- PRODUCTVERSION 1,2,6,0
+ FILEVERSION 1,2,7,0
+ PRODUCTVERSION 1,2,7,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
Modified: tomcat/native/trunk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/miscellaneous/changelog.xml?rev=1741084&r1=1741083&r2=1741084&view=diff
==
--- tomcat/native/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/native/trunk/xdocs/miscellaneous/changelog.xml Tue Apr 26 19:22:25
2016
@@ -34,6 +34,10 @@
This is the Changelog for Tomcat Native 1.2.
+
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1741080 - in /tomcat/trunk: java/org/apache/catalina/core/AprLifecycleListener.java java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java webapps/docs/changelog.xml
2016-04-26 21:17 GMT+02:00 : > Author: markt > Date: Tue Apr 26 19:17:55 2016 > New Revision: 1741080 > > URL: http://svn.apache.org/viewvc?rev=1741080&view=rev > Log: > Make the TLS certificate chain available to clients when using > JSSE+OpenSSL with the certificate chain stored in a Java KeyStore. > > Nice, I had completely forgotten this issue ... Rémy
Re: tomcat 7 broken on java 7 for linux distro
Romain, On 4/25/16 11:42 AM, Romain Manni-Bucau wrote: > Hi guys, > > tomcat uses ConcurrentHashMap in few places and doesn't rely on > ConcurrentMap API (ApplicationContext IIRC for instance was the case I > encounter). This means if you build tomcat with java 8 and run on java 7 it > is broken cause of this new KeyViewSet API used on java 8 (returned type is > used for method lookup at runtime). Which method, here? The return type of a method isn't officially part of the method's signature. Are you saying that the Java 8 compiler will choose a method (from a specific interface) at compile-time that doesn't exist in earlier versions of Java? Can this be fixed with a cast? -chris - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: tomcat 7 broken on java 7 for linux distro
Le 26 avr. 2016 22:27, "Christopher Schultz" a écrit : > > Romain, > > On 4/25/16 11:42 AM, Romain Manni-Bucau wrote: > > Hi guys, > > > > tomcat uses ConcurrentHashMap in few places and doesn't rely on > > ConcurrentMap API (ApplicationContext IIRC for instance was the case I > > encounter). This means if you build tomcat with java 8 and run on java 7 it > > is broken cause of this new KeyViewSet API used on java 8 (returned type is > > used for method lookup at runtime). > > Which method, here? The return type of a method isn't officially part of > the method's signature. Are you saying that the Java 8 compiler will > choose a method (from a specific interface) at compile-time that doesn't > exist in earlier versions of Java? > > Can this be fixed with a cast? > This is not java 8 specific. The method lookup is done using return type too - check bytecode with javap for instance. I didnt check if a cast fixes it but using a temp var should or moving the impl typing to the interface at field level fixes it in tomcat and no api is missing AFAIK. > -chris > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org >
Re: tomcat 7 broken on java 7 for linux distro
On 25/04/2016 16:42, Romain Manni-Bucau wrote: > Hi guys, > > tomcat uses ConcurrentHashMap in few places and doesn't rely on > ConcurrentMap API (ApplicationContext IIRC for instance was the case I > encounter). This means if you build tomcat with java 8 and run on java 7 it > is broken cause of this new KeyViewSet API used on java 8 (returned type is > used for method lookup at runtime). > > Why would you do it? Not sure but several linux distribution do it. > > I know we could easily ask all linux distro to build using java 7 but at > least fedora/redhat/ubuntu are impacted and tomcat can easily without > loosing any feature make it passing for that case using the interface > instead of the implementation as field type. > > Do you think it is possible or would you just move it over linux distro? I've been through the source code and I have a patch locally ready to commit that fixes this in 9.0.x. However... In some places, this would mean changing the API (usually a protected field) of an internal component we might reasonably expect some users to have extended. That is generally something we try and avoid in a point release unless the change is absolutely necessary (e.g. security) or we view the chances of it being used as very, very low. Therefore, I want to review my local changes and split them into two commits. The safe one and the API breaking one. I'm not sure the API breaking one is going to be back-ported beyond 8.5.x. Fundamentally, this is an issue for the distro. The Tomcat docs are quite specific (see BUILDING.txt) about which version of Java should be used to build Tomcat. If a distro wants to mess with that, they get to deal with the consequences. > If > this last one: how to ensure we don't get more regression in the future due > to another build process for user binaries? This is generally something we check during the release. It is mostly a manual process although it is automated where building with the wrong Java version causes issues for DBCP. Mark - 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, and has been outstanding for 10 runs. 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 9.x, a web server implementing the Java Servlet 4.0, ... 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: 1 min 39 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs -Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-6.18-SNAPSHOT.jar -Dexecute.validate=true validate [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-8-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/public/workspace/checkstyle/target/checkstyle-6.18-SNAPSHOT.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-20160427.jar:/srv/gump/packages/commons-collections3/commons-collections-3.2.1.jar:/srv/gump/public/workspace/apache-commons/cli/target/commons-cli-1.4-SNAPSHOT.jar:/srv/gump/public/workspace/commons-lang-trunk/target/commons-lang3-3.5-SNAPSHOT.ja r:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-20160427.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20160427.jar:/srv/gump/public/workspace/google-guava/guava/target/guava-20.0-SNAPSHOT.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: testexist: [echo] Testing for /srv/gump/public/workspace/checkstyle/target/checkstyle-6.18-SNAPSHOT.jar setproxy: downloadfile: validate: [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/res/checkstyle [checkstyle] Running Checkstyle 6.18-SNAPSHOT on 3073 files [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-trunk/webapps/docs/changelog.xml:215: Line matches the illegal pattern '\s+$'. [RegexpSingleline] BUILD FAILED /srv/gump/public/workspace/tomcat-trunk/build.xml:554: Got 1 errors and 0 warnings. Total time: 1 minute 38 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 2016042706, vmgump.apache.org:vmgump:2016042706 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
[GUMP@vmgump]: Project tomcat-tc8.0.x-test-apr (in module tomcat-8.0.x) 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-tc8.0.x-test-apr 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-tc8.0.x-test-apr : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-apr/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/logs-APR -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-APR/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-APR/logs] The following work was performed: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-apr/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-apr.html Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-apr (Type: Build) Work ended in a state of : Failed Elapsed: 51 mins 54 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar -Dtest.reports=output/logs-APR -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160427-native-src.tar.gz -Dexamples.sources.skip=true -Dbase.path=/srv/gump/public/workspace/tomcat-8.0.x/tomcat-build-libs -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native-12/dest-20160427/lib -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160427.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160427-native-src.tar.gz -Dtest.temp= output/test-tmp-APR -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest.openssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20160427/bin/openssl -Dexecute.test.bio=false -Dexecute.test.apr=true -Dtest.excludePerformance=true -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-8.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.0.x/output/testclasses:/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/public/workspace/tomcat-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/cata
svn commit: r1741147 - /tomcat/trunk/webapps/docs/changelog.xml
Author: violetagg Date: Wed Apr 27 05:56:17 2016 New Revision: 1741147 URL: http://svn.apache.org/viewvc?rev=1741147&view=rev Log: Fix typos 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=1741147&r1=1741146&r2=1741147&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Wed Apr 27 05:56:17 2016 @@ -144,7 +144,7 @@ 59284: Allow the Tomcat provided JASPIC -SimpleServerAuthConfig to pick up module confiuration +SimpleServerAuthConfig to pick up module configuration properties from either the property set passed to its constructor or from the properties passed in the call to getAuthContext. Based on a patch by Thomas Maslen. (markt) @@ -197,12 +197,12 @@ connection count. (markt) -59289: Do not recycle upgrade processors in unexpected clsoe +59289: Do not recycle upgrade processors in unexpected close situations. (remm) -59295: Use Locale.toLangaugeTag() to construct -the Content-Langauge HTTP header to ensure the locale is +59295: Use Locale.toLanguageTag() to construct +the Content-Language HTTP header to ensure the locale is correctly represented. Patch provided by zikfat. (markt) @@ -212,7 +212,7 @@ Make the TLS certificate chain available to clients when using JSSE+OpenSSL with the certificate chain stored in a Java KeyStore. -(markt) +(markt) @@ -231,7 +231,7 @@ Fix a regression caused by the connector refactoring and ensure that the thread context class loader is set to the to the web application -classloder when processing WebSocket messages on the server. (markt) +classloader when processing WebSocket messages on the server. (markt) Ensure that a client disconnection triggers the error handling for the - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1741148 - in /tomcat/tc8.5.x/trunk: ./ webapps/docs/changelog.xml
Author: violetagg Date: Wed Apr 27 06:01:48 2016 New Revision: 1741148 URL: http://svn.apache.org/viewvc?rev=1741148&view=rev Log: Merged revision 1741147 from tomcat/trunk: Fix typos Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Apr 27 06:01:48 2016 @@ -1 +1 @@ -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080 +/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147 Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1741148&r1=1741147&r2=1741148&view=diff == --- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Wed Apr 27 06:01:48 2016 @@ -139,7 +139,7 @@ 59284: Allow the Tomcat provided JASPIC -SimpleServerAuthConfig to pick up module confiuration +SimpleServerAuthConfig to pick up module configuration properties from either the property set passed to its constructor or from the properties passed in the call to getAuthContext. Based on a patch by Thomas Maslen. (markt) @@ -194,8 +194,8 @@ situations. (remm) -59295: Use Locale.toLangaugeTag() to construct -the Content-Langauge HTTP header to ensure the locale is +59295: Use Locale.toLanguageTag() to construct +the Content-Language HTTP header to ensure the locale is correctly represented. Patch provided by zikfat. (markt) @@ -205,7 +205,7 @@ Make the TLS certificate chain available to clients when using JSSE+OpenSSL with the certificate chain stored in a Java KeyStore. -(markt) +(markt) @@ -225,7 +225,7 @@ Fix a regression caused by the connector refactoring and ensure that the thread context class loader is set to the to the web application -classloder when processing WebSocket messages on the server. (markt) +classloader when processing WebSocket messages on the server. (markt) Ensure that a client disconnection triggers the error handling for the - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1741149 - in /tomcat/tc8.0.x/trunk: ./ webapps/docs/changelog.xml
Author: violetagg Date: Wed Apr 27 06:05:26 2016 New Revision: 1741149 URL: http://svn.apache.org/viewvc?rev=1741149&view=rev Log: Merged revision 1741147 from tomcat/trunk: Fix typos Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Apr 27 06:05:26 2016 @@ -1,2 +1,2 @@ /tomcat/tc8.5.x/trunk:1735042,1737966 -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886 ,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657 592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1 666387,1666494,1666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-168452 7,1684549-1684550,1685556,1685591,1685739,1685744,1685772,1685816,1685826,1685891,1687242,1687261,1687268,1687340,1687544,1687551,1688563,1688841,1688878,165,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,1690011,1690021,1690054,1690080,1690209,1691134,1691487,1691813,1692744-1692747,1692849,1692894,1692896,1693088,1693105,1693429,1693461,1694058,1694111,1694290,1694501,1694548,1694658,1694660,1694788
