dev@tomcat.apache.org
https://bz.apache.org/bugzilla/show_bug.cgi?id=60669 Mark Thomas changed: What|Removed |Added Resolution|--- |INVALID Status|NEW |RESOLVED --- Comment #1 from Mark Thomas --- tomcat-users.xml is an XML file. The '&' character is a reserved character in XML files must, therefore, be escaped when used. -- 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 60667] Information disclosure vulnerability leaking files from WEB-INF and META-INF
https://bz.apache.org/bugzilla/show_bug.cgi?id=60667 Mark Thomas changed: What|Removed |Added Resolution|--- |INVALID Status|NEW |RESOLVED OS||All --- Comment #1 from Mark Thomas --- Tomcat correctly returns a 404 for such requests. I suspect the root cause here is a poorly configured reverse proxy. Also, vulnerability reports should NOT be made via a public bug tracker. The correct process is described at http://tomcat.apache.org/security.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
svn commit: r1781042 - in /tomcat/site/trunk/xdocs: images/TomcatCon.png stylesheets/tomcat-site.xsl
Author: jfclere Date: Tue Jan 31 09:44:10 2017 New Revision: 1781042 URL: http://svn.apache.org/viewvc?rev=1781042&view=rev Log: Add image for TomcatCon and prepare the xls. Added: tomcat/site/trunk/xdocs/images/TomcatCon.png (with props) Modified: tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl Added: tomcat/site/trunk/xdocs/images/TomcatCon.png URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/images/TomcatCon.png?rev=1781042&view=auto == Binary file - no diff available. Propchange: tomcat/site/trunk/xdocs/images/TomcatCon.png -- svn:mime-type = image/png Modified: tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl?rev=1781042&r1=1781041&r2=1781042&view=diff == --- tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl (original) +++ tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl Tue Jan 31 09:44:10 2017 @@ -98,7 +98,7 @@ - http://www.apache.org/events/current-event.html"; target="_blank">http://www.apache.org/events/current-event-234x60.png"; alt="Upcoming Event" style="margin-right: 15px;"/> + http://events.linuxfoundation.org/events/apachecon-north-america/extend-the-experience/co-located-events#TomcatCon"; target="_blank"> http://www.apache.org/"; target="_blank"> ® - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 60560] Support systemd/inetd style socket activation
https://bz.apache.org/bugzilla/show_bug.cgi?id=60560 Mark Thomas changed: What|Removed |Added OS||All --- Comment #1 from Mark Thomas --- The patch assumes that there is only a single NIO endpoint. That assumption is not valid. The patch needs to handle the multiple end-point case. That in turn raises the question of how useful this feature is since it appears only to be able to handle a single channel. This feature is not compatible with NIO2. Nor is it compatible with APR/native. The patch needs to be extended to enable configuration to be used to specify which connector should use the inherited channel. I'd suggest either a new configuration option called "useInheritedChannel" or a special value for "address". My preference would be for a new option. It should be specific to NIO. Documentation is also required. -- 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: r1781046 - /tomcat/site/trunk/docs/
Author: jfclere Date: Tue Jan 31 10:00:10 2017 New Revision: 1781046 URL: http://svn.apache.org/viewvc?rev=1781046&view=rev Log: Push changes. Modified: tomcat/site/trunk/docs/ci.html tomcat/site/trunk/docs/conference.html tomcat/site/trunk/docs/contact.html tomcat/site/trunk/docs/download-60.html tomcat/site/trunk/docs/download-70.html tomcat/site/trunk/docs/download-80.html tomcat/site/trunk/docs/download-90.html tomcat/site/trunk/docs/download-connectors.html tomcat/site/trunk/docs/download-native.html tomcat/site/trunk/docs/download-taglibs.html tomcat/site/trunk/docs/findhelp.html tomcat/site/trunk/docs/getinvolved.html tomcat/site/trunk/docs/heritage.html tomcat/site/trunk/docs/index.html tomcat/site/trunk/docs/irc.html tomcat/site/trunk/docs/legal.html tomcat/site/trunk/docs/lists.html tomcat/site/trunk/docs/maven-plugin.html tomcat/site/trunk/docs/migration-6.html tomcat/site/trunk/docs/migration-7.html tomcat/site/trunk/docs/migration-8.html tomcat/site/trunk/docs/migration-85.html tomcat/site/trunk/docs/migration-9.html tomcat/site/trunk/docs/migration.html tomcat/site/trunk/docs/oldnews-2010.html tomcat/site/trunk/docs/oldnews-2011.html tomcat/site/trunk/docs/oldnews-2012.html tomcat/site/trunk/docs/oldnews-2013.html tomcat/site/trunk/docs/oldnews-2014.html tomcat/site/trunk/docs/oldnews-2015.html tomcat/site/trunk/docs/oldnews.html tomcat/site/trunk/docs/presentations.html tomcat/site/trunk/docs/resources.html tomcat/site/trunk/docs/security-3.html tomcat/site/trunk/docs/security-4.html tomcat/site/trunk/docs/security-5.html tomcat/site/trunk/docs/security-6.html tomcat/site/trunk/docs/security-7.html tomcat/site/trunk/docs/security-9.html tomcat/site/trunk/docs/security-jk.html tomcat/site/trunk/docs/security-native.html tomcat/site/trunk/docs/security-taglibs.html tomcat/site/trunk/docs/security.html tomcat/site/trunk/docs/taglibs.html tomcat/site/trunk/docs/tomcat-55-eol.html tomcat/site/trunk/docs/tomcat-60-eol.html tomcat/site/trunk/docs/tools.html tomcat/site/trunk/docs/whichversion.html tomcat/site/trunk/docs/whoweare.html Modified: tomcat/site/trunk/docs/ci.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/ci.html?rev=1781046&r1=1781045&r2=1781046&view=diff == --- tomcat/site/trunk/docs/ci.html (original) +++ tomcat/site/trunk/docs/ci.html Tue Jan 31 10:00:10 2017 @@ -16,7 +16,7 @@ -http://www.apache.org/events/current-event.html"; target="_blank">http://www.apache.org/events/current-event-234x60.png"; alt="Upcoming Event" style="margin-right: 15px;">http://www.apache.org/"; target="_blank"> +http://events.linuxfoundation.org/events/apachecon-north-america/extend-the-experience/co-located-events#TomcatCon"; target="_blank">http://www.apache.org/"; target="_blank"> Apache Tomcat® Modified: tomcat/site/trunk/docs/conference.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/conference.html?rev=1781046&r1=1781045&r2=1781046&view=diff == --- tomcat/site/trunk/docs/conference.html (original) +++ tomcat/site/trunk/docs/conference.html Tue Jan 31 10:00:10 2017 @@ -16,7 +16,7 @@ -http://www.apache.org/events/current-event.html"; target="_blank">http://www.apache.org/events/current-event-234x60.png"; alt="Upcoming Event" style="margin-right: 15px;">http://www.apache.org/"; target="_blank"> +http://events.linuxfoundation.org/events/apachecon-north-america/extend-the-experience/co-located-events#TomcatCon"; target="_blank">http://www.apache.org/"; target="_blank"> Apache Tomcat® Modified: tomcat/site/trunk/docs/contact.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/contact.html?rev=1781046&r1=1781045&r2=1781046&view=diff == --- tomcat/site/trunk/docs/contact.html (original) +++ tomcat/site/trunk/docs/contact.html Tue Jan 31 10:00:10 2017 @@ -16,7 +16,7 @@ -http://www.apache.org/events/current-event.html"; target="_blank">http://www.apache.org/events/current-event-234x60.png"; alt="Upcoming Event" style="margin-right: 15px;">http://www.apache.org/"; target="_blank"> +http://events.linuxfoundation.org/events/apachecon-north-america/extend-the-experience/co-located-events#TomcatCon"; target="_blank">http://www.apache.org/"; target="_blank"> Apache Tomcat® Modified: tomcat/site/trunk/docs/download-60.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-60.html?rev=1781046&r1=1781045&r2=1781046&view=diff == --- tomcat/site/trunk/docs/download-60.html (original) +++ tomcat/site/trunk/docs/download-60.htm
[Bug 60594] RFC 7230/3986 url requirement that prevents unencoded curly braces should be optional, since it breaks existing sites
https://bz.apache.org/bugzilla/show_bug.cgi?id=60594 --- Comment #10 from Mark Thomas --- Thanks for the updated patch. I like the overall design. Some detail comments: - I think a different name is required. We might want to override other restrictions in the future. Maybe requestTargetAllow - The docs need to state which characters are valid in the allowed list - What to do if some other invalid character is placed on the allowed list. Log a warning? - I'm still undecided on whether this should be per connector configuration We also need to decide which versions to add this to. I currently thinking: - 7.0.x - yes - 8.0.x - yes - 8.5.x - maybe - 9.0.x - no -- 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 60594] RFC 7230/3986 url requirement that prevents unencoded curly braces should be optional, since it breaks existing sites
https://bz.apache.org/bugzilla/show_bug.cgi?id=60594 --- Comment #11 from eolivelli --- Please fix it in Tomcat 8.5.X too -- 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: r1781049 - /tomcat/native/trunk/test/org/apache/tomcat/jni/
Author: markt Date: Tue Jan 31 10:30:41 2017 New Revision: 1781049 URL: http://svn.apache.org/viewvc?rev=1781049&view=rev Log: Drop the original JUnit3 test cases Removed: tomcat/native/trunk/test/org/apache/tomcat/jni/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1781050 - in /tomcat/native/trunk: java/org/apache/tomcat/ test/org/apache/tomcat/
Author: markt Date: Tue Jan 31 10:33:38 2017 New Revision: 1781050 URL: http://svn.apache.org/viewvc?rev=1781050&view=rev Log: Update externals Modified: tomcat/native/trunk/java/org/apache/tomcat/ (props changed) tomcat/native/trunk/test/org/apache/tomcat/ (props changed) Propchange: tomcat/native/trunk/java/org/apache/tomcat/ -- --- svn:externals (original) +++ svn:externals Tue Jan 31 10:33:38 2017 @@ -1 +1 @@ -^/tomcat/trunk/java/org/apache/tomcat/jni@1741664 jni +^/tomcat/trunk/java/org/apache/tomcat/jni@1780995 jni Propchange: tomcat/native/trunk/test/org/apache/tomcat/ -- --- svn:externals (added) +++ svn:externals Tue Jan 31 10:33:38 2017 @@ -0,0 +1 @@ +^/tomcat/trunk/test/org/apache/tomcat/jni@1780995 jni - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1781051 - /tomcat/native/trunk/
Author: markt Date: Tue Jan 31 10:34:11 2017 New Revision: 1781051 URL: http://svn.apache.org/viewvc?rev=1781051&view=rev Log: Update ignore list Modified: tomcat/native/trunk/ (props changed) Propchange: tomcat/native/trunk/ -- --- svn:ignore (original) +++ svn:ignore Tue Jan 31 10:34:11 2017 @@ -1,2 +1,4 @@ -dist +.classpath .project +.settings +dist - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1781052 - in /tomcat/native/trunk/examples/org/apache/tomcat/jni: Echo.java LocalServer.java SSLServer.java
Author: markt
Date: Tue Jan 31 10:40:02 2017
New Revision: 1781052
URL: http://svn.apache.org/viewvc?rev=1781052&view=rev
Log:
Fix IDE warnings
Modified:
tomcat/native/trunk/examples/org/apache/tomcat/jni/Echo.java
tomcat/native/trunk/examples/org/apache/tomcat/jni/LocalServer.java
tomcat/native/trunk/examples/org/apache/tomcat/jni/SSLServer.java
Modified: tomcat/native/trunk/examples/org/apache/tomcat/jni/Echo.java
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/examples/org/apache/tomcat/jni/Echo.java?rev=1781052&r1=1781051&r2=1781052&view=diff
==
--- tomcat/native/trunk/examples/org/apache/tomcat/jni/Echo.java (original)
+++ tomcat/native/trunk/examples/org/apache/tomcat/jni/Echo.java Tue Jan 31
10:40:02 2017
@@ -50,7 +50,7 @@ public class Echo {
echoNmax = Integer.decode(props.getProperty("echo.max",
"1")).intValue();
}
catch (Throwable t) {
-; // Nothing
+// NO-OP
}
}
@@ -90,6 +90,7 @@ public class Echo {
}
}
+@Override
public void run() {
int i = 0;
try {
@@ -168,6 +169,7 @@ public class Echo {
}
}
+@Override
public void run() {
while (true) {
try {
@@ -228,6 +230,7 @@ public class Echo {
from + "\r\n").getBytes();
}
+@Override
public void run() {
boolean doClose = false;
try {
@@ -328,6 +331,7 @@ public class Echo {
System.out.println("Starting Native Echo server example on port " +
echoAddr + ":" + echoPort);
+@SuppressWarnings("unused")
Echo echo = new Echo();
} catch (Exception e) {
e.printStackTrace();
Modified: tomcat/native/trunk/examples/org/apache/tomcat/jni/LocalServer.java
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/examples/org/apache/tomcat/jni/LocalServer.java?rev=1781052&r1=1781051&r2=1781052&view=diff
==
--- tomcat/native/trunk/examples/org/apache/tomcat/jni/LocalServer.java
(original)
+++ tomcat/native/trunk/examples/org/apache/tomcat/jni/LocalServer.java Tue Jan
31 10:40:02 2017
@@ -45,7 +45,7 @@ public class LocalServer {
serverNmax = Integer.decode(props.getProperty("local.max",
"0")).intValue();
}
catch (Throwable t) {
-; // Nothing
+// NO-OP
}
}
@@ -96,6 +96,7 @@ public class LocalServer {
}
}
+@Override
public void run() {
int i = 0;
try {
@@ -128,6 +129,7 @@ public class LocalServer {
from).getBytes();
}
+@Override
public void run() {
boolean doClose = false;
try {
@@ -157,7 +159,7 @@ public class LocalServer {
Socket.close(clientSock);
}
else
-Socket.send(clientSock, msg, 0, p);
+Socket.send(clientSock, msg, 0, p);
}
} catch (Exception e) {
Socket.destroy(clientSock);
@@ -173,6 +175,7 @@ public class LocalServer {
try {
Library.initialize(null);
+@SuppressWarnings("unused")
LocalServer server = new LocalServer();
} catch (Exception e) {
e.printStackTrace();
Modified: tomcat/native/trunk/examples/org/apache/tomcat/jni/SSLServer.java
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/examples/org/apache/tomcat/jni/SSLServer.java?rev=1781052&r1=1781051&r2=1781052&view=diff
==
--- tomcat/native/trunk/examples/org/apache/tomcat/jni/SSLServer.java (original)
+++ tomcat/native/trunk/examples/org/apache/tomcat/jni/SSLServer.java Tue Jan
31 10:40:02 2017
@@ -58,7 +58,7 @@ public class SSLServer {
serverPassword = props.getProperty("server.password", null);
}
catch (Throwable t) {
-; // Nothing
+// NO-OP
}
}
@@ -121,6 +121,7 @@ public class SSLServer {
}
}
+@Override
public void run() {
int i = 0;
try {
@@ -159,7 +160,7 @@ public class SSLServer {
this.getClass().getName());
SSLServer.incThreads();
worker.start();
-
+
}
else {
System.out.println("Handshake error: " +
SSL.getLastError());
@@ -185,6 +186,7 @@ public class SSLServer {
[Bug 60560] Support systemd/inetd style socket activation
https://bz.apache.org/bugzilla/show_bug.cgi?id=60560 --- Comment #2 from Remy Maucherat --- About NIO2, this doesn't work as the code in System.inheritableChannel uses the NIO API directly, but the API itself is "compatible" (an AsynchronousServerSocketChannel will implement Channel). Odd that this was never added (as a separate equivalent method). I think they forgot about this stuff (I had no idea it existed personally). -- 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: r1781059 - /tomcat/trunk/test/org/apache/tomcat/jni/TestSocketServer.java
Author: markt
Date: Tue Jan 31 11:25:57 2017
New Revision: 1781059
URL: http://svn.apache.org/viewvc?rev=1781059&view=rev
Log:
Increase timeout. Windows doesn't seem to handle very short timeouts
Modified:
tomcat/trunk/test/org/apache/tomcat/jni/TestSocketServer.java
Modified: tomcat/trunk/test/org/apache/tomcat/jni/TestSocketServer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/jni/TestSocketServer.java?rev=1781059&r1=1781058&r2=1781059&view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/jni/TestSocketServer.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/jni/TestSocketServer.java Tue Jan 31
11:25:57 2017
@@ -99,18 +99,18 @@ public class TestSocketServer {
/* Accept the client connection */
clientSocket = Socket.accept(serverSocket);
-/* Configure a 2ms timeout for reading from client */
-Socket.timeoutSet(clientSocket, 2000);
+/* Configure a 1s timeout for reading from client */
+Socket.timeoutSet(clientSocket, 100);
long timeout = Socket.timeoutGet(clientSocket);
-Assert.assertEquals("Socket.timeoutGet clientSocket failed", 2000,
timeout);
+Assert.assertEquals("Socket.timeoutGet clientSocket failed", 100,
timeout);
byte [] buf = new byte[1];
long start = System.nanoTime();
while (Socket.recv(clientSocket, buf, 0, 1) == 1) {
}
long wait = System.nanoTime() - start;
-Assert.assertFalse("Socket.timeoutSet failed (<1.5ms)", wait <
150);
-Assert.assertFalse("Socket.timeoutSet failed (>5.0ms)", wait >
500);
+Assert.assertFalse("Socket.timeoutSet failed (<1s) [" + wait + "]",
wait < 10);
+Assert.assertFalse("Socket.timeoutSet failed (>2s) [" + wait + "]",
wait > 20);
client.countDown();
client.join();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1781060 - /tomcat/native/trunk/test/org/apache/tomcat/
Author: markt Date: Tue Jan 31 11:27:59 2017 New Revision: 1781060 URL: http://svn.apache.org/viewvc?rev=1781060&view=rev Log: Update external to pick up test changes. Modified: tomcat/native/trunk/test/org/apache/tomcat/ (props changed) Propchange: tomcat/native/trunk/test/org/apache/tomcat/ -- --- svn:externals (original) +++ svn:externals Tue Jan 31 11:27:59 2017 @@ -1 +1 @@ -^/tomcat/trunk/test/org/apache/tomcat/jni@1780995 jni +^/tomcat/trunk/test/org/apache/tomcat/jni@1781059 jni - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1781061 - /tomcat/trunk/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java
Author: markt
Date: Tue Jan 31 11:32:25 2017
New Revision: 1781061
URL: http://svn.apache.org/viewvc?rev=1781061&view=rev
Log:
Don't rely on localhost
Modified:
tomcat/trunk/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java
Modified:
tomcat/trunk/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java?rev=1781061&r1=1781060&r2=1781061&view=diff
==
---
tomcat/trunk/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java
(original)
+++
tomcat/trunk/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java
Tue Jan 31 11:32:25 2017
@@ -35,7 +35,6 @@ import org.junit.Test;
public class TestSocketServerAnyLocalAddress {
private boolean nativeLibraryPresent = false;
-private int port = 0;
private long serverSocket = 0;
private long clientSocket = 0;
@@ -64,8 +63,6 @@ public class TestSocketServerAnyLocalAdd
if (!OS.IS_UNIX) {
Socket.optSet(serverSocket, Socket.APR_SO_REUSEADDR, 1);
}
-long localAddress = Address.get(Socket.APR_LOCAL, serverSocket);
-port = Address.getInfo(localAddress).port;
}
@@ -88,7 +85,7 @@ public class TestSocketServerAnyLocalAdd
@Test
public void testWithClient() throws Exception {
/* Start the client that connects to the server */
-Client client = new Client(serverSocket, port);
+Client client = new Client(serverSocket);
client.start();
boolean running = true;
@@ -127,11 +124,9 @@ public class TestSocketServerAnyLocalAdd
private static class Client extends java.lang.Thread {
private final long serverSocket;
-private final int port;
-public Client(long serverSocket, int port) throws Exception {
+public Client(long serverSocket) throws Exception {
this.serverSocket = serverSocket;
-this.port = port;
}
@Override
@@ -152,8 +147,9 @@ public class TestSocketServerAnyLocalAdd
throw new Exception("Read wrong data");
}
-/* Now use localhost to write 'E' */
-sock = new java.net.Socket("localhost", port);
+sock = new java.net.Socket();
+sock.connect(connectAddress, 1);
+sock.setSoTimeout(1);
ou = sock.getOutputStream();
ou.write('E');
ou.flush();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1781062 - in /tomcat/native/trunk: java/org/apache/tomcat/ test/org/apache/tomcat/
Author: markt Date: Tue Jan 31 11:34:13 2017 New Revision: 1781062 URL: http://svn.apache.org/viewvc?rev=1781062&view=rev Log: Update externals Modified: tomcat/native/trunk/java/org/apache/tomcat/ (props changed) tomcat/native/trunk/test/org/apache/tomcat/ (props changed) Propchange: tomcat/native/trunk/java/org/apache/tomcat/ -- --- svn:externals (original) +++ svn:externals Tue Jan 31 11:34:13 2017 @@ -1 +1 @@ -^/tomcat/trunk/java/org/apache/tomcat/jni@1780995 jni +^/tomcat/trunk/java/org/apache/tomcat/jni@1781061 jni Propchange: tomcat/native/trunk/test/org/apache/tomcat/ -- --- svn:externals (original) +++ svn:externals Tue Jan 31 11:34:13 2017 @@ -1 +1 @@ -^/tomcat/trunk/test/org/apache/tomcat/jni@1781059 jni +^/tomcat/trunk/test/org/apache/tomcat/jni@1781061 jni - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1781065 - in /tomcat/native/trunk: ./ build.properties.default build.xml xdocs/miscellaneous/changelog.xml
Author: markt
Date: Tue Jan 31 11:37:29 2017
New Revision: 1781065
URL: http://svn.apache.org/viewvc?rev=1781065&view=rev
Log:
Update to JUnit 4 and use an external to pull in the tests from 9.0.x
Modified:
tomcat/native/trunk/ (props changed)
tomcat/native/trunk/build.properties.default
tomcat/native/trunk/build.xml
tomcat/native/trunk/xdocs/miscellaneous/changelog.xml
Propchange: tomcat/native/trunk/
--
--- svn:ignore (original)
+++ svn:ignore Tue Jan 31 11:37:29 2017
@@ -1,4 +1,6 @@
.classpath
.project
.settings
+build.properties
dist
+logs
Modified: tomcat/native/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/build.properties.default?rev=1781065&r1=1781064&r2=1781065&view=diff
==
--- tomcat/native/trunk/build.properties.default (original)
+++ tomcat/native/trunk/build.properties.default Tue Jan 31 11:37:29 2017
@@ -36,16 +36,16 @@ compile.debug=off
compile.deprecation=on
compile.optimize=on
-base-tomcat.loc=http://archive.apache.org/dist/tomcat
-base-sf.loc=http://downloads.sourceforge.net
+base-maven.loc=http://repo.maven.apache.org/maven2
-# - JUnit Unit Test Suite, version 3.8 or later -
-# The JUnit version we will use
-junit.version=3.8.2
-# The directory containing your binary distribution of JUnit
-# It will be automatically downloaded if it doesn't exist
-junit.home=${base.path}/junit${junit.version}
-# The pathname of the "junit.jar" JAR file
-junit.jar=${junit.home}/junit.jar
-# The URL used to download JUnit if needed
-junit.loc=${base-sf.loc}/junit/junit${junit.version}.zip
+# - JUnit Unit Test Suite, version 4.11 or later -
+junit.version=4.11
+junit.home=${base.path}/junit-${junit.version}
+junit.jar=${junit.home}/junit-${junit.version}.jar
+junit.loc=${base-maven.loc}/junit/junit/${junit.version}/junit-${junit.version}.jar
+
+# - Hamcrest Library, used by JUnit, version 1.3 or later
+hamcrest.version=1.3
+hamcrest.home=${base.path}/hamcrest-${hamcrest.version}
+hamcrest.jar=${hamcrest.home}/hamcrest-core-${hamcrest.version}.jar
+hamcrest.loc=${base-maven.loc}/org/hamcrest/hamcrest-core/${hamcrest.version}/hamcrest-core-${hamcrest.version}.jar
Modified: tomcat/native/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/build.xml?rev=1781065&r1=1781064&r2=1781065&view=diff
==
--- tomcat/native/trunk/build.xml (original)
+++ tomcat/native/trunk/build.xml Tue Jan 31 11:37:29 2017
@@ -68,6 +68,7 @@
+
@@ -90,7 +91,8 @@
-
+
+
@@ -217,7 +219,8 @@ limitations under the License.-->">
debug="${compile.debug}"
deprecation="${compile.deprecation}"
optimize="${compile.optimize}"
-encoding="ISO-8859-1">
+encoding="ISO-8859-1"
+includeantruntime="false">
@@ -281,7 +284,8 @@ limitations under the License.-->">
debug="on"
deprecation="${compile.deprecation}"
optimize="${compile.optimize}"
-encoding="ISO-8859-1">
+encoding="ISO-8859-1"
+includeantruntime="false">
@@ -297,13 +301,19 @@ limitations under the License.-->">
-
-
-
-
-
+
+
+
+
-
+
+
+
+
+
+
+
Modified: tomcat/native/trunk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/miscellaneous/changelog.xml?rev=1781065&r1=1781064&r2=1781065&view=diff
==
--- tomcat/native/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/native/trunk/xdocs/miscellaneous/changelog.xml Tue Jan 31 11:37:29
2017
@@ -37,6 +37,11 @@
+ 58082: Update unit tests to use JUnit 4. Refactor unit tests
+ into separate tests and use an external to reference them in the same way
+ an external is used to reference the main code. (markt)
+
+
59996: Correctly handle building tc-native on a 64-bit system
when using an OpenSSL distribution that is not in /usr.
(csutherl)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58082] Old version of JUnit specified
https://bz.apache.org/bugzilla/show_bug.cgi?id=58082 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #1 from Mark Thomas --- Fixed for 1.2.11 onwards -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 52319] Tomcat 6 crashes with [libapr-1.so.0+0x196da] signed char+0x3a
https://bz.apache.org/bugzilla/show_bug.cgi?id=52319 Mark Thomas changed: What|Removed |Added Resolution|--- |WONTFIX Status|NEEDINFO|RESOLVED --- Comment #2 from Mark Thomas --- No further info in over three years. Tomcat 6.0.x is no longer supported and tc-native 1.1.x is close to end of life. If this issue is still seen with a supported Tomcat version and the latest 1.2.x tc-native, please create a new issue and provide the steps to reproduce it. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1781074 - /tomcat/site/trunk/docs/images/TomcatCon.png
Author: jfclere Date: Tue Jan 31 13:04:04 2017 New Revision: 1781074 URL: http://svn.apache.org/viewvc?rev=1781074&view=rev Log: Add missing images. Added: tomcat/site/trunk/docs/images/TomcatCon.png (with props) Added: tomcat/site/trunk/docs/images/TomcatCon.png URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/images/TomcatCon.png?rev=1781074&view=auto == Binary file - no diff available. Propchange: tomcat/site/trunk/docs/images/TomcatCon.png -- svn:mime-type = image/png - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54085] ssl_socket_recv sometimes loops infinitely with non-blocking sockets
https://bz.apache.org/bugzilla/show_bug.cgi?id=54085 Mark Thomas changed: What|Removed |Added Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #3 from Mark Thomas --- This was fixed in r1409681 (1.1.25 onwards) and r1712437 (1.2.2 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
[GUMP@vmgump-vm3]: Project tomcat-tc8.0.x-test-nio2 (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-nio2 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-nio2 : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump-vm3.apache.org/tomcat-8.0.x/tomcat-tc8.0.x-test-nio2/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-NIO2 -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO2/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO2/logs] The following work was performed: http://vmgump-vm3.apache.org/tomcat-8.0.x/tomcat-tc8.0.x-test-nio2/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2.html Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2 (Type: Build) Work ended in a state of : Failed Elapsed: 20 mins 33 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-8.0.x/tomcat-build-libs -Dexecute.test.nio2=true -Dtest.temp=output/test-tmp-NIO2 -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dtest.accesslog=true -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.6-SNAPSHOT.jar -Dexamples.sources.skip=true -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20170131.jar -Dtest.openssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20170131/bin/openssl -Dexecute.test.nio=false -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dexecute.test.apr=false -Dexecute.test.bio=false -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20170131-native-src.tar.gz -Dtest.repor ts=output/logs-NIO2 -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20170131-native-src.tar.gz -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dtest.relaxTiming=true -Dtest.excludePerformance=true -Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-8.0.x/true -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-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/wo
svn commit: r1781086 - in /tomcat/native/trunk: native/BUILDING xdocs/index.xml xdocs/miscellaneous/changelog.xml
Author: markt Date: Tue Jan 31 14:25:18 2017 New Revision: 1781086 URL: http://svn.apache.org/viewvc?rev=1781086&view=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=55114 Expand information for building on Windows. Modified: tomcat/native/trunk/native/BUILDING tomcat/native/trunk/xdocs/index.xml tomcat/native/trunk/xdocs/miscellaneous/changelog.xml Modified: tomcat/native/trunk/native/BUILDING URL: http://svn.apache.org/viewvc/tomcat/native/trunk/native/BUILDING?rev=1781086&r1=1781085&r2=1781086&view=diff == --- tomcat/native/trunk/native/BUILDING (original) +++ tomcat/native/trunk/native/BUILDING Tue Jan 31 14:25:18 2017 @@ -15,88 +15,118 @@ limitations under the License. -Prerequisites -- +Linux / Unix / OSX (dynamic linking) + -You need OpenSSL version 1.0.2 or higher and APR version 1.4.0 or higher. +1. Prerequisites -Building from source package -- + Install OpenSSL version 1.0.2 or higher + Install APR version 1.4.0 or higher. + Download and expand the source package or use an svn checkout -> configure --with-apr=apr_install_location --with-ssl=openssl_install_location -> make + > cd native -Building from the svn tree --- +2. Configure build environment -> sh buildconf --with-apr=apr_source_location. -> configure --with-apr=apr_install_location --with-ssl=openssl_install_location -> make + Note: This step is only required if you are building from an svn checkout. It + is not required when building from a source package. -Testing the build -- + > sh buildconf --with-apr=apr_source_location. -The make should produce a .so file named libtcnative-1.so. -Build the jar containing the examples by +3. Build -> cd .. -> ant jar - Run one of the example (the echo one): -> ant run-echo + > configure --with-apr=apr_install_location --with-ssl=openssl_install_location + > make + + This should produce a file named libtcnative-1.so + + Note: To build without SSL support use: + + > configure --disable-openssl --with-apr=apr_install_location + + +Linux / Unix / OSX (dynamic linking) + + +1. Build static version of OpenSSL 1.0.2 or later + + > ./config --prefix=~/natives/openssl no-shared -fPIC + > make + > make install_sw + + Note: For the Solaris platform you should use -KPIC instead -fPIC so that the + library is compiled with position independent code. + +2. Build static version of APR 1.4.0 or later + + > ./configure --prefix=~/natives/apr + > make + > make install + + Note: APR builds both static and dynamic libraries by default. + +3. Ensure the static APR library is used + + Edit the ~/natives/apr/lib/libapr-1.la file and comment or delete the + following sections: dlname='...' and library_names='...' + This is needed so that libtool picks the static version of the library. + +4. Build tc-native + + > ./configure --with-apr=~/natives/apr --with-ssl=~/natives/openssl --prefix=~/natives/tomcat + > make + > make install + + +Windows +=== + +1. Prerequisites + + These steps assume a suitable build environment has been set up. + https://cwiki.apache.org/confluence/display/TOMCAT/Common+Native+Build+Environment + +2. Obtain tc-native source + + Download and expand the source package or use an svn checkout + +3. Build APR + + Unpack the APR source distribution into native\srclib\apr + Apply apr-enable-ipv6.patch + + > c:\cmsc\setenv.bat /x86 + > nmake -f NMAKEmakefile BUILD_CPU=x86 APR_DECLARE_STATIC=1 + + > c:\cmsc\setenv.bat /x64 + > nmake -f NMAKEmakefile BUILD_CPU=x64 APR_DECLARE_STATIC=1 + +4. Build OpenSSL + + Unpack the OpenSSL source distribution into native\srclib\openssl + Apply openssl-msvcrt.patch + + > c:\cmsc\setenv.bat /x86 + > perl Configure VC-WIN32 + > ms\do_nasm + > nmake -f ms\nt.mak + > move out32 out32-x86 -Using it in Tomcat --- + > c:\cmsc\setenv.bat /x64 + > perl Configure VC-WIN64A + > ms\do_win64a + > nmake -f ms\nt.mak clean + > nmake -f ms\nt.mak + > move out32 out32-x64 -1. In use of conf/server.xml: - protocol="org.apache.coyote.http11.Http11AprProtocol" -2. In bin/setenv.sh add the following: - CATALINA_OPTS="$CATALINA_OPTS -Djava.library.path=tclib_location" - In my machine I am using: - /home/jfclere/native/native/.libs for tclib_location - -NOTES -- - - configure --disable-openssl: Configure without ssl support. - - To use it in Tomcat you may have to add in bin/setenv.sh: -LD_LIBRARY_PATH=openssl_install_location/lib; export LD_LIBRARY_PATH -(use ldd ./.libs/libtcnative-1.so to check it). - - quick testing: openssl s_client -connect l
[Bug 55114] BUILDING file in win32 source package contains UNIX build instructions
https://bz.apache.org/bugzilla/show_bug.cgi?id=55114 Mark Thomas changed: What|Removed |Added Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #2 from Mark Thomas --- Fixed for 1.2.11 -- 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: r1781098 - in /tomcat/native/trunk/native/src: ssl.c sslcontext.c
Author: markt
Date: Tue Jan 31 14:57:25 2017
New Revision: 1781098
URL: http://svn.apache.org/viewvc?rev=1781098&view=rev
Log:
Fix XCode IDE errors
Modified:
tomcat/native/trunk/native/src/ssl.c
tomcat/native/trunk/native/src/sslcontext.c
Modified: tomcat/native/trunk/native/src/ssl.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/ssl.c?rev=1781098&r1=1781097&r2=1781098&view=diff
==
--- tomcat/native/trunk/native/src/ssl.c (original)
+++ tomcat/native/trunk/native/src/ssl.c Tue Jan 31 14:57:25 2017
@@ -2096,12 +2096,14 @@ TCN_IMPLEMENT_CALL(jint, SSL, doHandshak
UNREFERENCED(o);
UNREFERENCED(ssl);
tcn_ThrowException(e, "Not implemented");
+ return 0;
}
TCN_IMPLEMENT_CALL(jint, SSL, renegotiate)(TCN_STDARGS, jlong ssl) {
UNREFERENCED(o);
UNREFERENCED(ssl);
tcn_ThrowException(e, "Not implemented");
+ return 0;
}
TCN_IMPLEMENT_CALL(jstring, SSL, getNextProtoNegotiated)(TCN_STDARGS, jlong
ssl) {
@@ -2207,12 +2209,14 @@ TCN_IMPLEMENT_CALL(jbyteArray, SSL, getS
UNREFERENCED(o);
UNREFERENCED(ssl);
tcn_ThrowException(e, "Not implemented");
+return 0;
}
TCN_IMPLEMENT_CALL(jint, SSL, getHandshakeCount)(TCN_STDARGS, jlong ssl)
{
UNREFERENCED(o);
UNREFERENCED(ssl);
tcn_ThrowException(e, "Not implemented");
+return 0;
}
/*** End Apple API Additions ***/
#endif /* HAVE_OPENSSL */
Modified: tomcat/native/trunk/native/src/sslcontext.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslcontext.c?rev=1781098&r1=1781097&r2=1781098&view=diff
==
--- tomcat/native/trunk/native/src/sslcontext.c (original)
+++ tomcat/native/trunk/native/src/sslcontext.c Tue Jan 31 14:57:25 2017
@@ -1913,6 +1913,7 @@ TCN_IMPLEMENT_CALL(jint, SSLContext, get
{
UNREFERENCED_STDARGS;
UNREFERENCED(ctx);
+return 0;
}
TCN_IMPLEMENT_CALL(void, SSLContext, clearOptions)(TCN_STDARGS, jlong ctx,
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1781100 - in /tomcat/native/trunk/native/src: network.c pool.c
Author: markt
Date: Tue Jan 31 15:08:52 2017
New Revision: 1781100
URL: http://svn.apache.org/viewvc?rev=1781100&view=rev
Log:
Partial fix for BZ 55938. Resolve 3 clang-analyzer warnings
Modified:
tomcat/native/trunk/native/src/network.c
tomcat/native/trunk/native/src/pool.c
Modified: tomcat/native/trunk/native/src/network.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/network.c?rev=1781100&r1=1781099&r2=1781100&view=diff
==
--- tomcat/native/trunk/native/src/network.c (original)
+++ tomcat/native/trunk/native/src/network.c Tue Jan 31 15:08:52 2017
@@ -404,6 +404,7 @@ TCN_IMPLEMENT_CALL(jlong, Socket, accept
}
return P2J(a);
cleanup:
+TCN_ASSERT(p != 0);
apr_pool_destroy(p);
return 0;
}
Modified: tomcat/native/trunk/native/src/pool.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/pool.c?rev=1781100&r1=1781099&r2=1781100&view=diff
==
--- tomcat/native/trunk/native/src/pool.c (original)
+++ tomcat/native/trunk/native/src/pool.c Tue Jan 31 15:08:52 2017
@@ -203,6 +203,7 @@ TCN_IMPLEMENT_CALL(jint, Pool, dataSet)(
UNREFERENCED(o);
TCN_ASSERT(pool != 0);
+TCN_ASSERT(key != 0);
if (apr_pool_userdata_get(&old, J2S(key), p) == APR_SUCCESS) {
if (old)
@@ -237,6 +238,7 @@ TCN_IMPLEMENT_CALL(jobject, Pool, dataGe
UNREFERENCED(o);
TCN_ASSERT(pool != 0);
+TCN_ASSERT(key != 0);
if (apr_pool_userdata_get(&old, J2S(key), p) == APR_SUCCESS) {
if (old) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1781102 - in /tomcat: native/trunk/native/src/file.c native/trunk/xdocs/miscellaneous/changelog.xml trunk/java/org/apache/tomcat/jni/File.java
Author: markt
Date: Tue Jan 31 15:15:43 2017
New Revision: 1781102
URL: http://svn.apache.org/viewvc?rev=1781102&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=55938
Resolve remaining issues
Note that the use of -1 to indicate the full array in File.(read|write)[Full]
has been removed since it was only partially implemented and the implementation
was faulty.
Modified:
tomcat/native/trunk/native/src/file.c
tomcat/native/trunk/xdocs/miscellaneous/changelog.xml
tomcat/trunk/java/org/apache/tomcat/jni/File.java
Modified: tomcat/native/trunk/native/src/file.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/file.c?rev=1781102&r1=1781101&r2=1781102&view=diff
==
--- tomcat/native/trunk/native/src/file.c (original)
+++ tomcat/native/trunk/native/src/file.c Tue Jan 31 15:15:43 2017
@@ -286,8 +286,6 @@ TCN_IMPLEMENT_CALL(jint, File, write)(TC
apr_status_t ss;
UNREFERENCED(o);
-if (towrite < 0)
-towrite = (*e)->GetArrayLength(e, buf);
ss = apr_file_write(f, bytes + offset, &nbytes);
(*e)->ReleasePrimitiveArrayCritical(e, buf, bytes, JNI_ABORT);
@@ -325,8 +323,6 @@ TCN_IMPLEMENT_CALL(jint, File, writeFull
jbyte *bytes = (*e)->GetByteArrayElements(e, buf, NULL);
UNREFERENCED(o);
-if (towrite < 0)
-towrite = (*e)->GetArrayLength(e, buf);
ss = apr_file_write_full(f, bytes + offset, nbytes, &written);
(*e)->ReleaseByteArrayElements(e, buf, bytes, JNI_ABORT);
Modified: tomcat/native/trunk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/miscellaneous/changelog.xml?rev=1781102&r1=1781101&r2=1781102&view=diff
==
--- tomcat/native/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/native/trunk/xdocs/miscellaneous/changelog.xml Tue Jan 31 15:15:43
2017
@@ -41,6 +41,12 @@
and expand the instructions for building for Windows platforms. (markt)
+ 55938: Resolve remaining clang-analyzer warnings. Note that
the
+ use of -1 to indicate the full array in
+ File.(read|write)[Full] has been removed since it was only
+ partially implemented and the implementation was faulty. (markt)
+
+
58082: Update unit tests to use JUnit 4. Refactor unit tests
into separate tests and use an external to reference them in the same way
an external is used to reference the main code. (markt)
Modified: tomcat/trunk/java/org/apache/tomcat/jni/File.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/File.java?rev=1781102&r1=1781101&r2=1781102&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/jni/File.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/File.java Tue Jan 31 15:15:43 2017
@@ -359,7 +359,7 @@ public class File {
* @param thefile The file descriptor to write to.
* @param buf The buffer which contains the data.
* @param offset Start offset in buf
- * @param nbytes The number of bytes to write; (-1) for full array.
+ * @param nbytes The number of bytes to write
* @return The number of bytes written.
*/
public static native int write(long thefile, byte[] buf, int offset, int
nbytes);
@@ -400,7 +400,7 @@ public class File {
* @param thefile The file descriptor to write to.
* @param buf The buffer which contains the data.
* @param offset Start offset in buf
- * @param nbytes The number of bytes to write; (-1) for full array.
+ * @param nbytes The number of bytes to write
* @return The number of bytes written.
*/
public static native int writeFull(long thefile, byte[] buf, int offset,
int nbytes);
@@ -469,7 +469,7 @@ public class File {
* @param thefile The file descriptor to read from.
* @param buf The buffer to store the data to.
* @param offset Start offset in buf
- * @param nbytes The number of bytes to read (-1) for full array.
+ * @param nbytes The number of bytes to read
* @return the number of bytes read.
*/
public static native int read(long thefile, byte[] buf, int offset, int
nbytes);
@@ -512,7 +512,7 @@ public class File {
* @param thefile The file descriptor to read from.
* @param buf The buffer to store the data to.
* @param offset Start offset in buf
- * @param nbytes The number of bytes to read (-1) for full array.
+ * @param nbytes The number of bytes to read
* @return the number of bytes read.
*/
public static native int readFull(long thefile, byte[] buf, int offset,
int nbytes);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...
[Bug 55938] clang-analyzer report for 1.1.31
https://bz.apache.org/bugzilla/show_bug.cgi?id=55938 --- Comment #5 from Mark Thomas --- Fixed for 1.2.11 -- 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: r1781104 - in /tomcat/native/trunk: java/org/apache/tomcat/ test/org/apache/tomcat/
Author: markt Date: Tue Jan 31 15:17:16 2017 New Revision: 1781104 URL: http://svn.apache.org/viewvc?rev=1781104&view=rev Log: Update externals Modified: tomcat/native/trunk/java/org/apache/tomcat/ (props changed) tomcat/native/trunk/test/org/apache/tomcat/ (props changed) Propchange: tomcat/native/trunk/java/org/apache/tomcat/ -- --- svn:externals (original) +++ svn:externals Tue Jan 31 15:17:16 2017 @@ -1 +1 @@ -^/tomcat/trunk/java/org/apache/tomcat/jni@1781061 jni +^/tomcat/trunk/java/org/apache/tomcat/jni@1781102 jni Propchange: tomcat/native/trunk/test/org/apache/tomcat/ -- --- svn:externals (original) +++ svn:externals Tue Jan 31 15:17:16 2017 @@ -1 +1 @@ -^/tomcat/trunk/test/org/apache/tomcat/jni@1781061 jni +^/tomcat/trunk/test/org/apache/tomcat/jni@1781102 jni - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55938] clang-analyzer report for 1.1.31
https://bz.apache.org/bugzilla/show_bug.cgi?id=55938 Mark Thomas changed: What|Removed |Added Resolution|--- |FIXED Status|NEW |RESOLVED -- 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 60594] RFC 7230/3986 url requirement that prevents unencoded curly braces should be optional, since it breaks existing sites
https://bz.apache.org/bugzilla/show_bug.cgi?id=60594 Coty Sutherland changed: What|Removed |Added Attachment #34684|0 |1 is obsolete|| Attachment #34687|0 |1 is obsolete|| Attachment #34694|0 |1 is obsolete|| --- Comment #12 from Coty Sutherland --- Created attachment 34698 --> https://bz.apache.org/bugzilla/attachment.cgi?id=34698&action=edit Updated patch proposal including a warning message for characters that aren't allowed (In reply to Mark Thomas from comment #10) > Thanks for the updated patch. I like the overall design. Some detail > comments: No problem. > - I think a different name is required. We might want to override other > restrictions in the future. Maybe requestTargetAllow That makes sense. > - The docs need to state which characters are valid in the allowed list Agreed. > - What to do if some other invalid character is placed on the allowed list. > Log a warning? I thought about that but since there isn't any logging there at the moment I let it go. I think it's a good idea to log a warning though, so I'll add that. > - I'm still undecided on whether this should be per connector configuration That would be nice, but I haven't dug into the code enough to be able to quickly provide a patch for it. > We also need to decide which versions to add this to. I currently thinking: > - 7.0.x - yes > - 8.0.x - yes +1 > - 8.5.x - maybe I'd vote yes on adding the option to 8.5.x because the stable version is already out and the behavior has changed. We obviously don't want to continue allowing broken clients to work, but I don't think we can change this behavior in a stable version, as evidenced by the users list complaints :) > - 9.0.x - no +1 I also noticed that the property being parsed was including the quotes, so I changed the commented out example accordingly. -- 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: r1781153 - /tomcat/trunk/test/org/apache/tomcat/jni/TestFile.java
Author: markt
Date: Tue Jan 31 19:53:35 2017
New Revision: 1781153
URL: http://svn.apache.org/viewvc?rev=1781153&view=rev
Log:
Add test case based on test case provided in
https://bz.apache.org/bugzilla/show_bug.cgi?id=52627 by Ilya Maykov.
Added:
tomcat/trunk/test/org/apache/tomcat/jni/TestFile.java (with props)
Added: tomcat/trunk/test/org/apache/tomcat/jni/TestFile.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/jni/TestFile.java?rev=1781153&view=auto
==
--- tomcat/trunk/test/org/apache/tomcat/jni/TestFile.java (added)
+++ tomcat/trunk/test/org/apache/tomcat/jni/TestFile.java Tue Jan 31 19:53:35
2017
@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tomcat.jni;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+
+public class TestFile {
+
+@Test
+public void testInfoGet() throws Exception {
+String testFile = "test/org/apache/tomcat/jni/TestFile.java";
+java.io.File file = new java.io.File(testFile);
+Assert.assertTrue("File " + testFile + " does not exist!",
file.exists());
+
+Library.initialize(null);
+long pool = Pool.create(0L);
+int openFlags = File.APR_FOPEN_READ | File.APR_FOPEN_BUFFERED |
File.APR_FOPEN_XTHREAD;
+int openPermissions = File.APR_FPROT_OS_DEFAULT;
+int statFlags = File.APR_FINFO_MIN;
+long fd = File.open(testFile, openFlags, openPermissions, pool);
+FileInfo fileInfo = new FileInfo();
+for (int i = 0; i < 10; i++) {
+org.apache.tomcat.jni.File.infoGet(fileInfo, statFlags, fd);
+@SuppressWarnings("unused")
+String info = inspectFileInfo(fileInfo);
+}
+}
+
+public static String inspectFileInfo(FileInfo fileInfo) {
+String result = fileInfo.toString() + " : {" +
+String.format("\n pool : %d", Long.valueOf(fileInfo.pool)) +
+String.format("\n valid : %d",
Integer.valueOf(fileInfo.valid)) +
+String.format("\n protection : %d",
Integer.valueOf(fileInfo.protection)) +
+String.format("\n filetype : %d",
Integer.valueOf(fileInfo.filetype)) +
+String.format("\n user : %d", Integer.valueOf(fileInfo.user))
+
+String.format("\n group : %d",
Integer.valueOf(fileInfo.group)) +
+String.format("\n inode : %d",
Integer.valueOf(fileInfo.inode)) +
+String.format("\n device : %d",
Integer.valueOf(fileInfo.device)) +
+String.format("\n nlink : %d",
Integer.valueOf(fileInfo.nlink)) +
+String.format("\n size : %d", Long.valueOf(fileInfo.size)) +
+String.format("\n csize : %d", Long.valueOf(fileInfo.csize)) +
+String.format("\n atime : %d", Long.valueOf(fileInfo.atime)) +
+String.format("\n mtime : %d", Long.valueOf(fileInfo.mtime)) +
+String.format("\n ctime : %d", Long.valueOf(fileInfo.ctime)) +
+String.format("\n fname : %s", fileInfo.fname) +
+String.format("\n name : %s", fileInfo.name) +
+String.format("\n filehand : %d",
Long.valueOf(fileInfo.filehand)) +
+"\n}";
+return result;
+}
+}
\ No newline at end of file
Propchange: tomcat/trunk/test/org/apache/tomcat/jni/TestFile.java
--
svn:eol-style = native
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 52627] Segmentation fault in org.apache.tomcat.jni.File.infoGet() native method
https://bz.apache.org/bugzilla/show_bug.cgi?id=52627 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #6 from Mark Thomas --- I couldn't repeat this on a current OSX but I've applied a variation of the patch for 1.2.11. I also turned the repro case into a JUnit test case. -- 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: r1781157 - in /tomcat/native/trunk: native/src/info.c xdocs/miscellaneous/changelog.xml
Author: markt
Date: Tue Jan 31 19:58:37 2017
New Revision: 1781157
URL: http://svn.apache.org/viewvc?rev=1781157&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=52627
Prevent a crash in File.infoGet() caused by the use of uninitialised
variables.
Based on patch by Ilya Maykov.
Modified:
tomcat/native/trunk/native/src/info.c
tomcat/native/trunk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/native/trunk/native/src/info.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/info.c?rev=1781157&r1=1781156&r2=1781157&view=diff
==
--- tomcat/native/trunk/native/src/info.c (original)
+++ tomcat/native/trunk/native/src/info.c Tue Jan 31 19:58:37 2017
@@ -216,7 +216,7 @@ TCN_IMPLEMENT_CALL(jint, File, stat)(TCN
apr_pool_t *p = J2P(pool, apr_pool_t *);
TCN_ALLOC_CSTRING(fname);
apr_status_t rv;
-apr_finfo_t info;
+apr_finfo_t info = {0};
UNREFERENCED(o);
@@ -235,7 +235,7 @@ TCN_IMPLEMENT_CALL(jobject, File, getSta
apr_pool_t *p = J2P(pool, apr_pool_t *);
TCN_ALLOC_CSTRING(fname);
apr_status_t rv;
-apr_finfo_t info;
+apr_finfo_t info = {0};
jobject finfo = NULL;
UNREFERENCED(o);
@@ -258,7 +258,7 @@ TCN_IMPLEMENT_CALL(jint, File, infoGet)(
{
apr_file_t *f = J2P(file, apr_file_t *);
apr_status_t rv;
-apr_finfo_t info;
+apr_finfo_t info = {0};
UNREFERENCED(o);
@@ -274,7 +274,7 @@ TCN_IMPLEMENT_CALL(jobject, File, getInf
{
apr_file_t *f = J2P(file, apr_file_t *);
apr_status_t rv;
-apr_finfo_t info;
+apr_finfo_t info = {0};
UNREFERENCED(o);
@@ -296,7 +296,7 @@ TCN_IMPLEMENT_CALL(jint, Directory, read
{
apr_dir_t *d = J2P(dir, apr_dir_t *);
apr_status_t rv;
-apr_finfo_t info;
+apr_finfo_t info = {0};
UNREFERENCED(o);
Modified: tomcat/native/trunk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/miscellaneous/changelog.xml?rev=1781157&r1=1781156&r2=1781157&view=diff
==
--- tomcat/native/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/native/trunk/xdocs/miscellaneous/changelog.xml Tue Jan 31 19:58:37
2017
@@ -37,6 +37,10 @@
+ 52627: Prevent a crash in File.infoGet() caused
by
+ the use of uninitialised variables. Based on patch by Ilya Maykov.
(markt)
+
+
55114: Clean up building instructions for the native component
and expand the instructions for building for Windows platforms. (markt)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building . Full details are available at: https://ci.apache.org/builders/tomcat-trunk/builds/2081 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch tomcat/trunk] 1781153 Blamelist: markt BUILD FAILED: failed compile_1 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1781163 - in /tomcat/trunk/test/org/apache/tomcat/jni: AbstractJniTest.java TestFile.java TestSocketServer.java TestSocketServerAnyLocalAddress.java
Author: markt
Date: Tue Jan 31 20:14:34 2017
New Revision: 1781163
URL: http://svn.apache.org/viewvc?rev=1781163&view=rev
Log:
Fix CI failure
Use abstract base class to configure the tc-native library and ensure tests
only run when it is available.
Added:
tomcat/trunk/test/org/apache/tomcat/jni/AbstractJniTest.java (with props)
Modified:
tomcat/trunk/test/org/apache/tomcat/jni/TestFile.java
tomcat/trunk/test/org/apache/tomcat/jni/TestSocketServer.java
tomcat/trunk/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java
Added: tomcat/trunk/test/org/apache/tomcat/jni/AbstractJniTest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/jni/AbstractJniTest.java?rev=1781163&view=auto
==
--- tomcat/trunk/test/org/apache/tomcat/jni/AbstractJniTest.java (added)
+++ tomcat/trunk/test/org/apache/tomcat/jni/AbstractJniTest.java Tue Jan 31
20:14:34 2017
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tomcat.jni;
+
+import org.junit.After;
+import org.junit.Assume;
+import org.junit.Before;
+
+public abstract class AbstractJniTest {
+
+private boolean nativeLibraryPresent = false;
+
+@Before
+public void initBase() throws Exception {
+try {
+Library.initialize(null);
+nativeLibraryPresent = true;
+} catch (LibraryNotFoundError lnfe) {
+nativeLibraryPresent = false;
+}
+Assume.assumeTrue("APR Library not found", nativeLibraryPresent);
+}
+
+
+@After
+public void destroyBase() {
+if (nativeLibraryPresent) {
+Library.terminate();
+}
+}
+
+}
Propchange: tomcat/trunk/test/org/apache/tomcat/jni/AbstractJniTest.java
--
svn:eol-style = native
Modified: tomcat/trunk/test/org/apache/tomcat/jni/TestFile.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/jni/TestFile.java?rev=1781163&r1=1781162&r2=1781163&view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/jni/TestFile.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/jni/TestFile.java Tue Jan 31 20:14:34
2017
@@ -20,7 +20,7 @@ import org.junit.Assert;
import org.junit.Test;
-public class TestFile {
+public class TestFile extends AbstractJniTest {
@Test
public void testInfoGet() throws Exception {
Modified: tomcat/trunk/test/org/apache/tomcat/jni/TestSocketServer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/jni/TestSocketServer.java?rev=1781163&r1=1781162&r2=1781163&view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/jni/TestSocketServer.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/jni/TestSocketServer.java Tue Jan 31
20:14:34 2017
@@ -21,18 +21,16 @@ import java.util.concurrent.CountDownLat
import org.junit.After;
import org.junit.Assert;
-import org.junit.Assume;
import org.junit.Before;
import org.junit.Test;
/**
* Tests for server-side sockets.
*/
-public class TestSocketServer {
+public class TestSocketServer extends AbstractJniTest {
private static final String HOST = "localhost";
-private boolean nativeLibraryPresent = false;
private int port = 0;
private long serverSocket = 0;
private long clientSocket = 0;
@@ -40,14 +38,6 @@ public class TestSocketServer {
@Before
public void init() throws Exception {
-try {
-Library.initialize(null);
-nativeLibraryPresent = true;
-} catch (LibraryNotFoundError lnfe) {
-nativeLibraryPresent = false;
-}
-Assume.assumeTrue("APR Library not found", nativeLibraryPresent);
-
long serverPool = Pool.create(0);
long inetAddress = Address.info(HOST, Socket.APR_INET,
0, 0, serverPool);
@@ -78,9 +68,6 @@ public class TestSocketServer {
Socket.close(serverSocket);
Socket.de
buildbot success in on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building . Full details are available at: https://ci.apache.org/builders/tomcat-trunk/builds/2082 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch tomcat/trunk] 1781163 Blamelist: markt Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1781168 - /tomcat/native/trunk/java/org/apache/tomcat/Apr.java
Author: markt
Date: Tue Jan 31 20:45:01 2017
New Revision: 1781168
URL: http://svn.apache.org/viewvc?rev=1781168&view=rev
Log:
Remove pointless code
Deprecate Apr class ready for removal in 1.3.x
Modified:
tomcat/native/trunk/java/org/apache/tomcat/Apr.java
Modified: tomcat/native/trunk/java/org/apache/tomcat/Apr.java
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/java/org/apache/tomcat/Apr.java?rev=1781168&r1=1781167&r2=1781168&view=diff
==
--- tomcat/native/trunk/java/org/apache/tomcat/Apr.java (original)
+++ tomcat/native/trunk/java/org/apache/tomcat/Apr.java Tue Jan 31 20:45:01 2017
@@ -14,28 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
package org.apache.tomcat;
-import java.io.InputStream;
-import java.util.Properties;
-
+/**
+ * @deprecated This will be removed in 1.3.x
+ */
+@Deprecated
public class Apr {
-private static String aprInfo = null;
-
-static {
-
-try {
-InputStream is = Apr.class.getResourceAsStream
-("/org/apache/tomcat/apr.properties");
-Properties props = new Properties();
-props.load(is);
-is.close();
-aprInfo = props.getProperty("tcn.info");
-}
-catch (Throwable t) {
-; // Nothing
-}
-}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 59807] tomcat 8.5.3 use native cause NULL when AprEndpoint.bind()
https://bz.apache.org/bugzilla/show_bug.cgi?id=59807 Mark Thomas changed: What|Removed |Added Product|Tomcat Native |Tomcat 9 Target Milestone|--- |- Component|Library |Connectors Version|1.2.7 |9.0.0.M17 --- Comment #3 from Mark Thomas --- This isn't a Tomcat Native issue. This is a Tomcat issue caused when there is no SSLHostConfig that matches the defaultSSLHostConfigName -- 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: r1781174 - in /tomcat/trunk: java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java java/org/apache/tomcat/util/net/AprEndpoint.java java/org/apache/tomcat/util/net/LocalStrings.propert
Author: markt
Date: Tue Jan 31 21:43:14 2017
New Revision: 1781174
URL: http://svn.apache.org/viewvc?rev=1781174&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=59807
Provide a better error message when there is no SSLHostConfig defined with a
hostName that matches the defaultSSLHostConfigName for the associated Connector.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java?rev=1781174&r1=1781173&r2=1781174&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java Tue
Jan 31 21:43:14 2017
@@ -84,6 +84,13 @@ public abstract class AbstractJsseEndpoi
for (SSLHostConfig sslHostConfig : sslHostConfigs.values()) {
createSSLContext(sslHostConfig);
}
+
+// Validate default SSLHostConfigName
+if (sslHostConfigs.get(getDefaultSSLHostConfigName()) == null) {
+throw new
IllegalArgumentException(sm.getString("endpoint.noSslHostConfig",
+getDefaultSSLHostConfigName(), getName()));
+}
+
}
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1781174&r1=1781173&r2=1781174&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Tue Jan 31
21:43:14 2017
@@ -373,6 +373,10 @@ public class AprEndpoint extends Abstrac
createSSLContext(sslHostConfig);
}
SSLHostConfig defaultSSLHostConfig =
sslHostConfigs.get(getDefaultSSLHostConfigName());
+if (defaultSSLHostConfig == null) {
+throw new
IllegalArgumentException(sm.getString("endpoint.noSslHostConfig",
+getDefaultSSLHostConfigName(), getName()));
+}
Long defaultSSLContext = defaultSSLHostConfig.getOpenSslContext();
sslContext = defaultSSLContext.longValue();
SSLContext.registerDefault(defaultSSLContext, this);
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=1781174&r1=1781173&r2=1781174&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties Tue
Jan 31 21:43:14 2017
@@ -48,6 +48,7 @@ endpoint.init.bind=Socket bind failed: [
endpoint.init.listen=Socket listen failed: [{0}] {1}
endpoint.init.notavail=APR not available
endpoint.launch.fail=Failed to launch new runnable
+endpoint.noSslHostConfig=No SSLHostConfig element was found with the hostName
[{0}] to match the defaultSSLHostConfigName for the connector [{1}]
endpoint.noSslHostName=No host name was provided for the SSL host configuration
endpoint.poll.limitedpollsize=Failed to create poller with specified size of
{0}
endpoint.poll.initfail=Poller creation failed
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1781174&r1=1781173&r2=1781174&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Jan 31 21:43:14 2017
@@ -87,6 +87,12 @@
Restore Java 9 direct byte buffer compatibility. (remm)
+59807: Provide a better error message when there is no
+SSLHostConfig defined with a hostName
that
+matches the defaultSSLHostConfigName for the associated
+Connector. (markt)
+
+
60627: Modify the Rfc6265CookieProcessor so
that
in addition to cookie headers that start with an explicit RFC 2109
$Version=1, cookies that start with
$Version=0
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1781175 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java java/org/apache/tomcat/util/net/AprEndpoint.java java/org/apache/tomcat/util/net/LocalStri
Author: markt Date: Tue Jan 31 21:43:52 2017 New Revision: 1781175 URL: http://svn.apache.org/viewvc?rev=1781175&view=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=59807 Provide a better error message when there is no SSLHostConfig defined with a hostName that matches the defaultSSLHostConfigName for the associated Connector. Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jan 31 21:43:52 2017 @@ -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,1737903,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,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501 ,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747 924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1 756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-1762053,1762123,1762168,176217 2,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762
[Bug 59807] tomcat 8.5.3 use native cause NULL when AprEndpoint.bind()
https://bz.apache.org/bugzilla/show_bug.cgi?id=59807 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #4 from Mark Thomas --- Fixed in: - trunk for 9.0.0.M18 onwards - 8.5.x for 8.5.12 onwards -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55771] Memory leak and then crash in org.apache.tomcat.jni.Address.getip after a day
https://bz.apache.org/bugzilla/show_bug.cgi?id=55771 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |WORKSFORME --- Comment #1 from Mark Thomas --- The Address.getip code is unchanged since 2006. I've been unable to recreate this issue, nor have I found any similar reports. My working assumption at this point is that there was a memory leak that has since been fixed. If you are still experiencing this error then we'll need enough information to reproduce it (including exact version numbers) to investigate further. -- 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
