[Bug 63767] New: install windows service, tomcat9 start crash.
https://bz.apache.org/bugzilla/show_bug.cgi?id=63767 Bug ID: 63767 Summary: install windows service, tomcat9 start crash. Product: Tomcat 9 Version: 9.0.26 Hardware: PC Status: NEW Severity: normal Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: 6900...@qq.com Target Milestone: - Created attachment 36797 --> https://bz.apache.org/bugzilla/attachment.cgi?id=36797&action=edit the picture for this bug. i test 9.0.24 and 9.0.26 in my machine. after install to service. start the service, it will crash. but i can start the tomcat by startup.bat. 9.0.22 is worked well in the same machine. java version "1.8.0_201" Java(TM) SE Runtime Environment (build 1.8.0_201-b09) Java HotSpot(TM) 64-Bit Server VM (build 25.201-b09, mixed mode) windows 2012 standard x64. there are no logs in tomcat\log folder. [2019-09-24 15:34:51] [info] [11636] Apache Commons Daemon procrun (1.2.1.0 64-bit) started. [2019-09-24 15:34:51] [info] [11636] Running Service 'Tomcat9'... [2019-09-24 15:34:51] [info] [17080] Starting service... windows event log Faulting application name: Tomcat9.exe, version: 1.2.1.0, time stamp: 0x5d6fdd78 Faulting module name: unknown, version: 0.0.0.0, time stamp: 0x Exception code: 0xc005 Fault offset: 0x00a60f28 Faulting process id: 0x2724 Faulting application start time: 0x01d572ab2621283f Faulting application path: E:\apache-tomcat-9.0.26\bin\Tomcat9.exe Faulting module path: unknown Report Id: 6412b89b-de9e-11e9-9651-001b215cf05b Faulting package full name: Faulting package-relative application ID: if i doesn't intall it to service. only run startup.bat. everything work well. in this machine 9.0.22 work well for services start. -- 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 63767] install windows service, tomcat9 start crash.
https://bz.apache.org/bugzilla/show_bug.cgi?id=63767 王化亮 <6900...@qq.com> changed: What|Removed |Added OS||All --- Comment #1 from 王化亮 <6900...@qq.com> --- it is not all windows 2012 doesn't work. it is random, i can't find the root 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
[Bug 63765] NIO2 Connector with OpenSSL 1.1.1 hangs with TLSv1.3
https://bz.apache.org/bugzilla/show_bug.cgi?id=63765 --- Comment #2 from Coty Sutherland --- > I cannot reproduce this that reliably personally, it may be only visible on > localhost. Weird. I can reproduce this between two machines as well, so it doesn't seem to be a lo only issue. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 63759] Unable to launch uninstaller: insufficient permissions to access Uninstall.exe
https://bz.apache.org/bugzilla/show_bug.cgi?id=63759 --- Comment #2 from Mark Thomas --- Having worked on this a bit I think there is a simpler option. Make the icon file readable and the uninstaller readable/executable for all authenticated users. Being able to execute the uninstaller isn't a privilege escalation as a) it will request admin privs and b) you still need privs to remove the service and/or installed files. This approach is much simpler to implement (it doesn't need to determine current user or vary depending on the option chosen for "Create shortcuts for all users". I should be in a position to commit a fix along these lines shortly. -- 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 63765] NIO2 Connector with OpenSSL 1.1.1 hangs with TLSv1.3
https://bz.apache.org/bugzilla/show_bug.cgi?id=63765 --- Comment #3 from Rainer Jung --- I can also reproduce on SLES 12 and RHEL 7 but not on Solaris. For me it does not happen with a real remote connection, but always with local ones and with connections from another virtual guest on the same host system, so specifics of the IP stack might be relevant. I am using tcnative 1.2.23 build against APR 1.7.0 and OpenSSL 1.1.1d. My curl is 7.66.0 also build against OpenSSL 1.1.1d. Java is 1.8.0, also observable with Java 11. TC is TC9 git 6a173978c5865421192578da21ec8f418e5a3da4 (2019-09-19). Some debug log lines: End of startup: 24-Sep-2019 13:48:29.200 INFO [main] org.apache.catalina.startup.Catalina.start Server startup in [2,003] milliseconds Start of request: 24-Sep-2019 13:49:09.410 FINE [https-openssl-nio2-8443-exec-3] org.apache.tomcat.util.threads.LimitLatch.countUpOrAwait Counting up[https-openssl-nio2-8443-exec-3] latch=1 24-Sep-2019 13:49:09.436 FINE [https-openssl-nio2-8443-exec-2] org.apache.tomcat.util.net.SecureNio2Channel.processSNI The SNI host name extracted for connection [sun.nio.ch.UnixAsynchronousSocketChannelImpl[connected local=/0:0:0:0:0:0:0:1:8443 remote=/0:0:0:0:0:0:0:1:50367]] was [localhost] 24-Sep-2019 13:49:09.457 FINE [https-openssl-nio2-8443-exec-4] org.apache.coyote.AbstractProtocol$ConnectionHandler.process Processing socket [org.apache.tomcat.util.net.SecureNio2Channel@76110ba6:sun.nio.ch.UnixAsynchronousSocketChannelImpl[connected local=/0:0:0:0:0:0:0:1:8443 remote=/0:0:0:0:0:0:0:1:50367]] with status [OPEN_READ] 24-Sep-2019 13:49:09.457 FINE [https-openssl-nio2-8443-exec-4] org.apache.coyote.AbstractProtocol$ConnectionHandler.process Found processor [null] for socket [org.apache.tomcat.util.net.SecureNio2Channel@76110ba6:sun.nio.ch.UnixAsynchronousSocketChannelImpl[connected local=/0:0:0:0:0:0:0:1:8443 remote=/0:0:0:0:0:0:0:1:50367]] 24-Sep-2019 13:49:09.458 FINE [https-openssl-nio2-8443-exec-4] org.apache.coyote.AbstractProtocol$ConnectionHandler.process Popped processor [null] from cache 24-Sep-2019 13:49:09.493 FINE [https-openssl-nio2-8443-exec-4] org.apache.coyote.AbstractProtocol$ConnectionHandler.register Register Catalina:type=RequestProcessor,worker="https-openssl-nio2-8443",name=HttpRequest1 24-Sep-2019 13:49:09.497 FINE [https-openssl-nio2-8443-exec-4] org.apache.tomcat.util.net.SocketWrapperBase.populateReadBuffer Socket: [org.apache.tomcat.util.net.Nio2Endpoint$Nio2SocketWrapper@4ed079d9:org.apache.tomcat.util.net.SecureNio2Channel@76110ba6:sun.nio.ch.UnixAsynchronousSocketChannelImpl[connected local=/0:0:0:0:0:0:0:1:8443 remote=/0:0:0:0:0:0:0:1:50367]], Read from buffer: [0] 24-Sep-2019 13:49:09.499 FINE [https-openssl-nio2-8443-exec-4] org.apache.tomcat.util.net.Nio2Endpoint$Nio2SocketWrapper.read Socket: [org.apache.tomcat.util.net.Nio2Endpoint$Nio2SocketWrapper@4ed079d9:org.apache.tomcat.util.net.SecureNio2Channel@76110ba6:sun.nio.ch.UnixAsynchronousSocketChannelImpl[connected local=/0:0:0:0:0:0:0:1:8443 remote=/0:0:0:0:0:0:0:1:50367]], Read into buffer: [0] 24-Sep-2019 13:49:09.499 FINE [https-openssl-nio2-8443-exec-4] org.apache.coyote.AbstractProcessorLight.process Socket: [org.apache.tomcat.util.net.Nio2Endpoint$Nio2SocketWrapper@4ed079d9:org.apache.tomcat.util.net.SecureNio2Channel@76110ba6:sun.nio.ch.UnixAsynchronousSocketChannelImpl[connected local=/0:0:0:0:0:0:0:1:8443 remote=/0:0:0:0:0:0:0:1:50367]], Status in: [OPEN_READ], State out: [OPEN] 24-Sep-2019 13:49:09.500 FINE [https-openssl-nio2-8443-exec-4] org.apache.coyote.AbstractProtocol$ConnectionHandler.release Pushed Processor [org.apache.coyote.http11.Http11Processor@20d73a43] then the hang occurs. After a minute, curl gets "empty reply from server" and the logs show: 24-Sep-2019 13:50:09.501 FINE [https-openssl-nio2-8443-exec-6] org.apache.coyote.AbstractProtocol$ConnectionHandler.process Processing socket [org.apache.tomcat.util.net.SecureNio2Channel@76110ba6:sun.nio.ch.UnixAsynchronousSocketChannelImpl[connected local=/0:0:0:0:0:0:0:1:8443 remote=/0:0:0:0:0:0:0:1:50367]] with status [ERROR] 24-Sep-2019 13:50:09.502 FINE [https-openssl-nio2-8443-exec-6] org.apache.coyote.AbstractProtocol$ConnectionHandler.process Found processor [null] for socket [org.apache.tomcat.util.net.SecureNio2Channel@76110ba6:sun.nio.ch.UnixAsynchronousSocketChannelImpl[connected local=/0:0:0:0:0:0:0:1:8443 remote=/0:0:0:0:0:0:0:1:50367]] 24-Sep-2019 13:50:09.502 FINE [https-openssl-nio2-8443-exec-6] org.apache.tomcat.util.net.Nio2Endpoint$Nio2SocketWrapper.doClose Calling [org.apache.tomcat.util.net.Nio2Endpoint@6d79b7f7].closeSocket([org.apache.tomcat.util.net.Nio2Endpoint$Nio2SocketWrapper@4ed079d9:org.apache.tomcat.util.net.SecureNio2Channel@76110ba6:sun.nio.ch.UnixAsynchronousSocketChannelImpl[connected local=/0:0:0:0:0:0:0:1:8443 remote=/0:0:0:0:0:0:0:1:50367]]) java.lang.Exception at org.apache.tomcat.util.net.Nio2Endpoint$Nio2SocketWrapper.doClose(Nio2Endpoint.java:915)
[Bug 63765] NIO2 Connector with OpenSSL 1.1.1 hangs with TLSv1.3
https://bz.apache.org/bugzilla/show_bug.cgi?id=63765 --- Comment #4 from Rainer Jung --- For comparison the Nio (not NIO2) log snippet where the request works: 24-Sep-2019 13:54:40.068 FINE [https-openssl-nio-8443-Acceptor] org.apache.tomcat.util.threads.LimitLatch.countUpOrAwait Counting up[https-openssl-nio-8443-Acceptor] latch=1 24-Sep-2019 13:54:40.076 FINE [https-openssl-nio-8443-exec-1] org.apache.tomcat.util.net.SecureNioChannel.processSNI The SNI host name extracted for connection [java.nio.channels.SocketChannel[connected local=/0:0:0:0:0:0:0:1:8443 remote=/0:0:0:0:0:0:0:1:51197]] was [localhost] 24-Sep-2019 13:54:40.094 FINE [https-openssl-nio-8443-exec-3] org.apache.coyote.AbstractProtocol$ConnectionHandler.process Processing socket [org.apache.tomcat.util.net.SecureNioChannel@39172781:java.nio.channels.SocketChannel[connected local=/0:0:0:0:0:0:0:1:8443 remote=/0:0:0:0:0:0:0:1:51197]] with status [OPEN_READ] 24-Sep-2019 13:54:40.095 FINE [https-openssl-nio-8443-exec-3] org.apache.coyote.AbstractProtocol$ConnectionHandler.process Found processor [null] for socket [org.apache.tomcat.util.net.SecureNioChannel@39172781:java.nio.channels.SocketChannel[connected local=/0:0:0:0:0:0:0:1:8443 remote=/0:0:0:0:0:0:0:1:51197]] 24-Sep-2019 13:54:40.095 FINE [https-openssl-nio-8443-exec-3] org.apache.coyote.AbstractProtocol$ConnectionHandler.process Popped processor [null] from cache 24-Sep-2019 13:54:40.132 FINE [https-openssl-nio-8443-exec-3] org.apache.coyote.AbstractProtocol$ConnectionHandler.register Register Catalina:type=RequestProcessor,worker="https-openssl-nio-8443",name=HttpRequest1 24-Sep-2019 13:54:40.135 FINE [https-openssl-nio-8443-exec-3] org.apache.tomcat.util.net.SocketWrapperBase.populateReadBuffer Socket: [org.apache.tomcat.util.net.NioEndpoint$NioSocketWrapper@6c99b5c8:org.apache.tomcat.util.net.SecureNioChannel@39172781:java.nio.channels.SocketChannel[connected local=/0:0:0:0:0:0:0:1:8443 remote=/0:0:0:0:0:0:0:1:51197]], Read from buffer: [0] Looks the same until here, but now Nio does: 24-Sep-2019 13:54:40.136 FINE [https-openssl-nio-8443-exec-3] org.apache.tomcat.util.net.NioEndpoint$NioSocketWrapper.read Socket: [org.apache.tomcat.util.net.NioEndpoint$NioSocketWrapper@6c99b5c8:org.apache.tomcat.util.net.SecureNioChannel@39172781:java.nio.channels.SocketChannel[connected local=/0:0:0:0:0:0:0:1:8443 remote=/0:0:0:0:0:0:0:1:51197]], Read direct from socket: [78] 24-Sep-2019 13:54:40.136 FINE [https-openssl-nio-8443-exec-3] org.apache.coyote.http11.Http11InputBuffer.parseRequestLine Received [GET / HTTP/1.1 Host: localhost:8443 User-Agent: curl/7.66.0 Accept: */* ] 24-Sep-2019 13:54:40.161 FINE [https-openssl-nio-8443-exec-3] org.apache.tomcat.util.http.Parameters.setQueryStringCharset Set query string encoding to UTF-8 24-Sep-2019 13:54:40.375 FINE [https-openssl-nio-8443-exec-3] org.apache.tomcat.util.net.SocketWrapperBase.populateReadBuffer Socket: [org.apache.tomcat.util.net.NioEndpoint$NioSocketWrapper@6c99b5c8:org.apache.tomcat.util.net.SecureNioChannel@39172781:java.nio.channels.SocketChannel[connected local=/0:0:0:0:0:0:0:1:8443 remote=/0:0:0:0:0:0:0:1:51197]], Read from buffer: [0] 24-Sep-2019 13:54:40.376 FINE [https-openssl-nio-8443-exec-3] org.apache.tomcat.util.net.NioEndpoint$NioSocketWrapper.read Socket: [org.apache.tomcat.util.net.NioEndpoint$NioSocketWrapper@6c99b5c8:org.apache.tomcat.util.net.SecureNioChannel@39172781:java.nio.channels.SocketChannel[connected local=/0:0:0:0:0:0:0:1:8443 remote=/0:0:0:0:0:0:0:1:51197]], Read direct from socket: [0] 24-Sep-2019 13:54:40.377 FINE [https-openssl-nio-8443-exec-3] org.apache.coyote.AbstractProcessorLight.process Socket: [org.apache.tomcat.util.net.NioEndpoint$NioSocketWrapper@6c99b5c8:org.apache.tomcat.util.net.SecureNioChannel@39172781:java.nio.channels.SocketChannel[connected local=/0:0:0:0:0:0:0:1:8443 remote=/0:0:0:0:0:0:0:1:51197]], Status in: [OPEN_READ], State out: [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
[Bug 63765] NIO2 Connector with OpenSSL 1.1.1 hangs with TLSv1.3
https://bz.apache.org/bugzilla/show_bug.cgi?id=63765 --- Comment #5 from Rainer Jung --- And here Nio2 using TLS 1.2: ... 24-Sep-2019 15:16:55.232 FINE [https-openssl-nio2-8443-exec-4] org.apache.tomcat.util.net.SocketWrapperBase.populateReadBuffer Socket: [org.apache.tomcat.util.net.Nio2Endpoint$Nio2SocketWrapper@281c779a:org.apache.tomcat.util.net.SecureNio2Channel@1f564c66:sun.nio.ch.UnixAsynchronousSocketChannelImpl[connected local=/0:0:0:0:0:0:0:1:8443 remote=/0:0:0:0:0:0:0:1:19684]], Read from buffer: [0] but now 24-Sep-2019 15:16:55.236 FINE [https-openssl-nio2-8443-exec-4] org.apache.tomcat.util.net.Nio2Endpoint$Nio2SocketWrapper$2.completed Socket: [org.apache.tomcat.util.net.Nio2Endpoint$Nio2SocketWrapper@281c779a:org.apache.tomcat.util.net.SecureNio2Channel@1f564c66:sun.nio.ch.UnixAsynchronousSocketChannelImpl[connected local=/0:0:0:0:0:0:0:1:8443 remote=/0:0:0:0:0:0:0:1:19684]], Interest: [false] 24-Sep-2019 15:16:55.237 FINE [https-openssl-nio2-8443-exec-4] org.apache.tomcat.util.net.Nio2Endpoint$Nio2SocketWrapper.read Socket: [org.apache.tomcat.util.net.Nio2Endpoint$Nio2SocketWrapper@281c779a:org.apache.tomcat.util.net.SecureNio2Channel@1f564c66:sun.nio.ch.UnixAsynchronousSocketChannelImpl[connected local=/0:0:0:0:0:0:0:1:8443 remote=/0:0:0:0:0:0:0:1:19684]], Read into buffer: [78] 24-Sep-2019 15:16:55.237 FINE [https-openssl-nio2-8443-exec-4] org.apache.tomcat.util.net.SocketWrapperBase.populateReadBuffer Socket: [org.apache.tomcat.util.net.Nio2Endpoint$Nio2SocketWrapper@281c779a:org.apache.tomcat.util.net.SecureNio2Channel@1f564c66:sun.nio.ch.UnixAsynchronousSocketChannelImpl[connected local=/0:0:0:0:0:0:0:1:8443 remote=/0:0:0:0:0:0:0:1:19684]], Read from buffer: [78] -- 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 63765] NIO2 Connector with OpenSSL 1.1.1 hangs with TLSv1.3
https://bz.apache.org/bugzilla/show_bug.cgi?id=63765
--- Comment #6 from Rainer Jung ---
(In reply to Remy Maucherat from comment #1)
> This looked like the usual not-unwrapping-enough "IO" issue, so changing the
> initial value of unwrapBeforeRead to true in SecureNio2Channel.reset avoids
> it. Not sure if it is 100% safe (although it looks rather similar to NIO
> with its non blocking read returning 0).
> I cannot reproduce this that reliably personally, it may be only visible on
> localhost.
At least it fixes the problem for me:
diff --git a/java/org/apache/tomcat/util/net/SecureNio2Channel.java
b/java/org/apache/tomcat/util/net/SecureNio2Channel.java
index 9e5ab07ea0..da899b26aa 100644
--- a/java/org/apache/tomcat/util/net/SecureNio2Channel.java
+++ b/java/org/apache/tomcat/util/net/SecureNio2Channel.java
@@ -132,6 +132,7 @@ public class SecureNio2Channel extends Nio2Channel {
handshakeComplete = false;
closed = false;
closing = false;
+unwrapBeforeRead = true;
netInBuffer.clear();
}
Can't say whether it is safe though.
--
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 63765] NIO2 Connector with OpenSSL 1.1.1 hangs with TLSv1.3
https://bz.apache.org/bugzilla/show_bug.cgi?id=63765 --- Comment #7 from Remy Maucherat --- (In reply to Rainer Jung from comment #6) > Can't say whether it is safe though. It likely sounds safe to unwrap first (it would do an underflow and cause a read) reading some previous comment: https://github.com/apache/tomcat/commit/3f3dfc63e12e816d68f1a2e21e80d77513e2a2d4 At least I am not getting any test issues so it's worth trying ... -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: https://bz.apache.org/bugzilla/show_bug.cgi?id=63759 Uninstaller & UAC
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/master by this push: new ec41b4c https://bz.apache.org/bugzilla/show_bug.cgi?id=63759 Uninstaller & UAC ec41b4c is described below commit ec41b4c0ead2fbe8b0d0fe759326a6702856b809 Author: Mark Thomas AuthorDate: Tue Sep 24 15:31:17 2019 +0100 https://bz.apache.org/bugzilla/show_bug.cgi?id=63759 Uninstaller & UAC When installing Tomcat with the Windows installer, grant sufficient privileges to enable the uninstaller to execute when user account control is active. --- res/tomcat.nsi | 37 + webapps/docs/changelog.xml | 5 + 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/res/tomcat.nsi b/res/tomcat.nsi index c50f084..28ebd4b 100644 --- a/res/tomcat.nsi +++ b/res/tomcat.nsi @@ -368,16 +368,45 @@ Section -post ; S-1-5-19 LocalService ; S-1-5-32-544 Local Administrators group ; S-1-5-18 Local System + ; S-1-5-11 Authenticated users + ; + ; Grant admins, LocalService and Local System full control full control nsExec::ExecToStack 'icacls "$INSTDIR" /inheritance:r /grant *S-1-5-19:(OI)(CI)(F) /grant *S-1-5-32-544:(OI)(CI)(F) /grant *S-1-5-18:(OI)(CI)(F)' Pop $0 Pop $1 - StrCmp $0 "0" SetPermissionsOk + StrCmp $0 "0" SetGroupPermissionsOk FileWrite $ServiceInstallLog "Install failed (setting file permissions): $0 $1$\r$\n" MessageBox MB_YESNO|MB_ICONSTOP \ "Failed to set file permissions.$\r$\nCheck your settings and permissions.$\r$\nIgnore and continue anyway (not recommended)?" \ - /SD IDNO IDYES SetPermissionsOk - Quit - SetPermissionsOk: + /SD IDNO IDYES SetGroupPermissionsOk +Quit + SetGroupPermissionsOk: + ClearErrors + + ; Make the icon readable to all authenticated users so it appears correctly in the uninstall UI + nsExec::ExecToStack 'icacls "$INSTDIR\tomcat.ico" /inheritance:e /grant *S-1-5-11:(R)' + Pop $0 + Pop $1 + StrCmp $0 "0" SetIconPermissionsOk +FileWrite $ServiceInstallLog "Install failed (setting file permissions for icon): $0 $1$\r$\n" +MessageBox MB_YESNO|MB_ICONSTOP \ + "Failed to set icon file permissions.$\r$\nCheck your settings and permissions.$\r$\nIgnore and continue anyway (not recommended)?" \ + /SD IDNO IDYES SetIconPermissionsOk +Quit + SetIconPermissionsOk: + ClearErrors + + ; Make the uninstaller readable and executable to all authenticated users so the user that installed Tomcat can also uninstall it + nsExec::ExecToStack 'icacls "$INSTDIR\Uninstall.exe" /inheritance:e /grant *S-1-5-11:(RX)' + Pop $0 + Pop $1 + StrCmp $0 "0" SetUninstallerPermissionsOk +FileWrite $ServiceInstallLog "Install failed (setting file permissions for uninstaller): $0 $1$\r$\n" +MessageBox MB_YESNO|MB_ICONSTOP \ + "Failed to set uninstaller file permissions.$\r$\nCheck your settings and permissions.$\r$\nIgnore and continue anyway (not recommended)?" \ + /SD IDNO IDYES SetUninstallerPermissionsOk +Quit + SetUninstallerPermissionsOk: ClearErrors SectionEnd diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index ff0d171..2b160da 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -81,6 +81,11 @@ org.apache.tomcat.util.net.TesterSupport and has been moved there. (rjung) + +63759: When installing Tomcat with the Windows installer, +grant sufficient privileges to enable the uninstaller to execute when +user account control is active. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: https://bz.apache.org/bugzilla/show_bug.cgi?id=63759 Uninstaller & UAC
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/8.5.x by this push: new da37f36 https://bz.apache.org/bugzilla/show_bug.cgi?id=63759 Uninstaller & UAC da37f36 is described below commit da37f3654daacf20fa9340886c0367e9d58ce5f6 Author: Mark Thomas AuthorDate: Tue Sep 24 15:31:17 2019 +0100 https://bz.apache.org/bugzilla/show_bug.cgi?id=63759 Uninstaller & UAC When installing Tomcat with the Windows installer, grant sufficient privileges to enable the uninstaller to execute when user account control is active. --- res/tomcat.nsi | 37 + webapps/docs/changelog.xml | 5 + 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/res/tomcat.nsi b/res/tomcat.nsi index a4f92e4..d6255b4 100644 --- a/res/tomcat.nsi +++ b/res/tomcat.nsi @@ -368,16 +368,45 @@ Section -post ; S-1-5-19 LocalService ; S-1-5-32-544 Local Administrators group ; S-1-5-18 Local System + ; S-1-5-11 Authenticated users + ; + ; Grant admins, LocalService and Local System full control full control nsExec::ExecToStack 'icacls "$INSTDIR" /inheritance:r /grant *S-1-5-19:(OI)(CI)(F) /grant *S-1-5-32-544:(OI)(CI)(F) /grant *S-1-5-18:(OI)(CI)(F)' Pop $0 Pop $1 - StrCmp $0 "0" SetPermissionsOk + StrCmp $0 "0" SetGroupPermissionsOk FileWrite $ServiceInstallLog "Install failed (setting file permissions): $0 $1$\r$\n" MessageBox MB_YESNO|MB_ICONSTOP \ "Failed to set file permissions.$\r$\nCheck your settings and permissions.$\r$\nIgnore and continue anyway (not recommended)?" \ - /SD IDNO IDYES SetPermissionsOk - Quit - SetPermissionsOk: + /SD IDNO IDYES SetGroupPermissionsOk +Quit + SetGroupPermissionsOk: + ClearErrors + + ; Make the icon readable to all authenticated users so it appears correctly in the uninstall UI + nsExec::ExecToStack 'icacls "$INSTDIR\tomcat.ico" /inheritance:e /grant *S-1-5-11:(R)' + Pop $0 + Pop $1 + StrCmp $0 "0" SetIconPermissionsOk +FileWrite $ServiceInstallLog "Install failed (setting file permissions for icon): $0 $1$\r$\n" +MessageBox MB_YESNO|MB_ICONSTOP \ + "Failed to set icon file permissions.$\r$\nCheck your settings and permissions.$\r$\nIgnore and continue anyway (not recommended)?" \ + /SD IDNO IDYES SetIconPermissionsOk +Quit + SetIconPermissionsOk: + ClearErrors + + ; Make the uninstaller readable and executable to all authenticated users so the user that installed Tomcat can also uninstall it + nsExec::ExecToStack 'icacls "$INSTDIR\Uninstall.exe" /inheritance:e /grant *S-1-5-11:(RX)' + Pop $0 + Pop $1 + StrCmp $0 "0" SetUninstallerPermissionsOk +FileWrite $ServiceInstallLog "Install failed (setting file permissions for uninstaller): $0 $1$\r$\n" +MessageBox MB_YESNO|MB_ICONSTOP \ + "Failed to set uninstaller file permissions.$\r$\nCheck your settings and permissions.$\r$\nIgnore and continue anyway (not recommended)?" \ + /SD IDNO IDYES SetUninstallerPermissionsOk +Quit + SetUninstallerPermissionsOk: ClearErrors SectionEnd diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index e24309c..b0a824d 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -78,6 +78,11 @@ org.apache.tomcat.util.net.TesterSupport and has been moved there. (rjung) + +63759: When installing Tomcat with the Windows installer, +grant sufficient privileges to enable the uninstaller to execute when +user account control is active. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 7.0.x updated: https://bz.apache.org/bugzilla/show_bug.cgi?id=63759 Uninstaller & UAC
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 7.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/7.0.x by this push: new 664e5e1 https://bz.apache.org/bugzilla/show_bug.cgi?id=63759 Uninstaller & UAC 664e5e1 is described below commit 664e5e17d2f02e17bd777029e2b3afe77fb0272a Author: Mark Thomas AuthorDate: Tue Sep 24 15:31:17 2019 +0100 https://bz.apache.org/bugzilla/show_bug.cgi?id=63759 Uninstaller & UAC When installing Tomcat with the Windows installer, grant sufficient privileges to enable the uninstaller to execute when user account control is active. --- res/tomcat.nsi | 37 + webapps/docs/changelog.xml | 17 +++-- 2 files changed, 44 insertions(+), 10 deletions(-) diff --git a/res/tomcat.nsi b/res/tomcat.nsi index 438506e..f2c9077 100644 --- a/res/tomcat.nsi +++ b/res/tomcat.nsi @@ -367,16 +367,45 @@ Section -post ; S-1-5-19 LocalService ; S-1-5-32-544 Local Administrators group ; S-1-5-18 Local System + ; S-1-5-11 Authenticated users + ; + ; Grant admins, LocalService and Local System full control full control nsExec::ExecToStack 'icacls "$INSTDIR" /inheritance:r /grant *S-1-5-19:(OI)(CI)(F) /grant *S-1-5-32-544:(OI)(CI)(F) /grant *S-1-5-18:(OI)(CI)(F)' Pop $0 Pop $1 - StrCmp $0 "0" SetPermissionsOk + StrCmp $0 "0" SetGroupPermissionsOk FileWrite $ServiceInstallLog "Install failed (setting file permissions): $0 $1$\r$\n" MessageBox MB_YESNO|MB_ICONSTOP \ "Failed to set file permissions.$\r$\nCheck your settings and permissions.$\r$\nIgnore and continue anyway (not recommended)?" \ - /SD IDNO IDYES SetPermissionsOk - Quit - SetPermissionsOk: + /SD IDNO IDYES SetGroupPermissionsOk +Quit + SetGroupPermissionsOk: + ClearErrors + + ; Make the icon readable to all authenticated users so it appears correctly in the uninstall UI + nsExec::ExecToStack 'icacls "$INSTDIR\tomcat.ico" /inheritance:e /grant *S-1-5-11:(R)' + Pop $0 + Pop $1 + StrCmp $0 "0" SetIconPermissionsOk +FileWrite $ServiceInstallLog "Install failed (setting file permissions for icon): $0 $1$\r$\n" +MessageBox MB_YESNO|MB_ICONSTOP \ + "Failed to set icon file permissions.$\r$\nCheck your settings and permissions.$\r$\nIgnore and continue anyway (not recommended)?" \ + /SD IDNO IDYES SetIconPermissionsOk +Quit + SetIconPermissionsOk: + ClearErrors + + ; Make the uninstaller readable and executable to all authenticated users so the user that installed Tomcat can also uninstall it + nsExec::ExecToStack 'icacls "$INSTDIR\Uninstall.exe" /inheritance:e /grant *S-1-5-11:(RX)' + Pop $0 + Pop $1 + StrCmp $0 "0" SetUninstallerPermissionsOk +FileWrite $ServiceInstallLog "Install failed (setting file permissions for uninstaller): $0 $1$\r$\n" +MessageBox MB_YESNO|MB_ICONSTOP \ + "Failed to set uninstaller file permissions.$\r$\nCheck your settings and permissions.$\r$\nIgnore and continue anyway (not recommended)?" \ + /SD IDNO IDYES SetUninstallerPermissionsOk +Quit + SetUninstallerPermissionsOk: ClearErrors SectionEnd diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 3018274..a352705 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -215,7 +215,7 @@ 63625: Update to Commons Daemon 1.2.1. This corrects several -regressions in Commons Daemon 1.2.1, most notably the Windows Service +regressions in Commons Daemon 1.2.0, most notably the Windows Service crashing on start when using 32-bit JVMs. (markt) @@ -269,6 +269,16 @@ org.apache.tomcat.util.net.TesterSupport and has been moved there. (rjung) + +When performing a silent install with the Windows Installer, ensure that +the registry entires are added to the 64-bit registry when using a +64-bit JVM. (markt) + + +63759: When installing Tomcat with the Windows installer, +grant sufficient privileges to enable the uninstaller to execute when +user account control is active. (markt) + @@ -280,11 +290,6 @@ reject them with a 400 response rather than triggering an internal error that results in a 500 response. (markt) - -When performing a silent install with the Windows Installer, ensure that -the registry entires are added to the 64-bit registry when using a -64-bit JVM. (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-7-trunk
The Buildbot has detected a new failure on builder tomcat-7-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-7-trunk/builds/1460 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' triggered this build Build Source Stamp: [branch 7.0.x] 664e5e17d2f02e17bd777029e2b3afe77fb0272a Blamelist: Mark Thomas 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
[tomcat] branch master updated: BZ63765: Try to unwrap first after handshake
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 1cbb2ed BZ63765: Try to unwrap first after handshake
1cbb2ed is described below
commit 1cbb2ed755118650b60a7e0292f9384dde8340f5
Author: remm
AuthorDate: Tue Sep 24 18:07:03 2019 +0200
BZ63765: Try to unwrap first after handshake
This seems to only be an issue right after the handshake.
---
java/org/apache/tomcat/util/net/SecureNio2Channel.java | 3 ++-
webapps/docs/changelog.xml | 4
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/net/SecureNio2Channel.java
b/java/org/apache/tomcat/util/net/SecureNio2Channel.java
index 9e5ab07..740f12b 100644
--- a/java/org/apache/tomcat/util/net/SecureNio2Channel.java
+++ b/java/org/apache/tomcat/util/net/SecureNio2Channel.java
@@ -70,7 +70,7 @@ public class SecureNio2Channel extends Nio2Channel {
protected boolean closed;
protected boolean closing;
-private volatile boolean unwrapBeforeRead = false;
+private volatile boolean unwrapBeforeRead;
private final CompletionHandler>
handshakeReadCompletionHandler;
private final CompletionHandler>
handshakeWriteCompletionHandler;
@@ -130,6 +130,7 @@ public class SecureNio2Channel extends Nio2Channel {
sslEngine = null;
sniComplete = false;
handshakeComplete = false;
+unwrapBeforeRead = true;
closed = false;
closing = false;
netInBuffer.clear();
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 2b160da..aea333c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -52,6 +52,10 @@
generating or parsing the HTTP2-Settings header as part of
an HTTP upgrade to h2c as required by RFC 7540. (markt)
+
+63765: NIO2 should try to unwrap after TLS handshake to
+avoid edge cases. (remm)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 03/07: Add Javadoc link for Servlet 4.0
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git commit f15841883b5a0fa93cbefd958f0cfbee03192ae8 Author: Mark Thomas AuthorDate: Tue Sep 24 16:35:36 2019 +0100 Add Javadoc link for Servlet 4.0 --- webapps/docs/index.xml | 7 ++- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/webapps/docs/index.xml b/webapps/docs/index.xml index 007f607..e72c8e8 100644 --- a/webapps/docs/index.xml +++ b/webapps/docs/index.xml @@ -167,12 +167,9 @@ are responsible for installing, configuring, and operating an Apache Tomcat serv and others. Servlet 4.0 https://jcp.org/aboutJava/communityprocess/final/jsr369/index.html";> -Specification - JSP 2.3 https://jcp.org/aboutJava/communityprocess/mrel/jsr245/index2.html";> - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 06/07: Fix xml source file that wasn't using expected version replacement
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 280d0587926da86bad569a431e6ec3a50317e512 Author: Mark Thomas AuthorDate: Tue Sep 24 17:07:18 2019 +0100 Fix xml source file that wasn't using expected version replacement No special characters used in the source block so just remove the CDATA --- webapps/docs/appdev/processes.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webapps/docs/appdev/processes.xml b/webapps/docs/appdev/processes.xml index 6138b42..276e868 100644 --- a/webapps/docs/appdev/processes.xml +++ b/webapps/docs/appdev/processes.xml @@ -126,7 +126,7 @@ the sample build.xml script. At a minimum, you will generally need to define the catalina.home property defining where Tomcat is installed, and the manager application username and password. You might end up with something like this: - +manager.password=mypassword In general, you will not want to check the build.properties file in to the CVS repository, because it - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 07/07: Fix xml source file that wasn't using expected version replacement
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 709978183d763b27009b0d02908ae1eda50308dd Author: Mark Thomas AuthorDate: Tue Sep 24 17:07:55 2019 +0100 Fix xml source file that wasn't using expected version replacement Source block is xml so need to xml escape so we can remove the CDATA allowing the version replacement to work. --- webapps/docs/default-servlet.xml | 116 +++ 1 file changed, 58 insertions(+), 58 deletions(-) diff --git a/webapps/docs/default-servlet.xml b/webapps/docs/default-servlet.xml index cd7d30e..b6d1e62 100644 --- a/webapps/docs/default-servlet.xml +++ b/webapps/docs/default-servlet.xml @@ -249,23 +249,23 @@ Format: The following is a sample xsl file which mimics the default tomcat behavior: - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/07: Align Java version references
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 6ee85f39532e0eb2294f15c1f443c7589f1bf8aa Author: Mark Thomas AuthorDate: Tue Sep 24 16:14:17 2019 +0100 Align Java version references --- build.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.xml b/build.xml index 1f61ee4..75c250a 100644 --- a/build.xml +++ b/build.xml @@ -90,9 +90,9 @@ - - - + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/07: Fix spacing
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 5444c1681d44cf8f0d28121b56682a82d10e3668 Author: Mark Thomas AuthorDate: Tue Sep 24 16:09:29 2019 +0100 Fix spacing --- build.xml | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build.xml b/build.xml index 7d37c12..1f61ee4 100644 --- a/build.xml +++ b/build.xml @@ -1462,11 +1462,11 @@ - - - - - + + + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 05/07: Parameterise minimum Java version
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 70340d1241e0d97b821de243a83d9fbfb443deb8
Author: Mark Thomas
AuthorDate: Tue Sep 24 17:00:31 2019 +0100
Parameterise minimum Java version
---
RELEASE-NOTES| 2 +-
RUNNING.txt | 2 +-
build.xml| 2 ++
res/tomcat.nsi | 2 +-
res/welcome.bin.html | 2 +-
res/welcome.main.html| 2 +-
webapps/docs/appdev/installation.xml | 2 +-
webapps/docs/changelog.xml | 5 +
webapps/docs/cluster-howto.xml | 2 +-
webapps/docs/setup.xml | 4 ++--
webapps/docs/tomcat-docs.xsl | 4
11 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 2377d4f..825889a 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -38,7 +38,7 @@ CONTENTS:
===
Dependency Changes:
===
-Tomcat @VERSION_MAJOR_MINOR@ is designed to run on Java SE 8 and later.
+Tomcat @VERSION_MAJOR_MINOR@ is designed to run on Java @MIN_JAVA_VERSION@ and
later.
==
diff --git a/RUNNING.txt b/RUNNING.txt
index 0c6bb98..c71620b 100644
--- a/RUNNING.txt
+++ b/RUNNING.txt
@@ -157,7 +157,7 @@ create the following script file:
On Windows, %CATALINA_BASE%\bin\setenv.bat:
- set "JRE_HOME=%ProgramFiles%\Java\jre8"
+ set "JRE_HOME=%ProgramFiles%\Java\jre@MIN_JAVA_VERSION@"
exit /b 0
On *nix, $CATALINA_BASE/bin/setenv.sh:
diff --git a/build.xml b/build.xml
index 75c250a..020531c 100644
--- a/build.xml
+++ b/build.xml
@@ -94,6 +94,7 @@
+
@@ -240,6 +241,7 @@
+
diff --git a/res/tomcat.nsi b/res/tomcat.nsi
index 28ebd4b..5ab5f60 100644
--- a/res/tomcat.nsi
+++ b/res/tomcat.nsi
@@ -132,7 +132,7 @@ Var ServiceInstallLog
LangString TEXT_CONF_SUBTITLE ${LANG_ENGLISH} "Tomcat basic configuration."
LangString TEXT_CONF_PAGETITLE ${LANG_ENGLISH} ": Configuration Options"
- LangString TEXT_JVM_LABEL1 ${LANG_ENGLISH} "Please select the path of a Java
SE 8.0 or later JRE installed on your system."
+ LangString TEXT_JVM_LABEL1 ${LANG_ENGLISH} "Please select the path of a Java
@MIN_JAVA_VERSION@ or later JRE installed on your system."
LangString TEXT_CONF_LABEL_PORT_SHUTDOWN ${LANG_ENGLISH} "Server Shutdown
Port"
LangString TEXT_CONF_LABEL_PORT_HTTP ${LANG_ENGLISH} "HTTP/1.1 Connector
Port"
LangString TEXT_CONF_LABEL_PORT_AJP ${LANG_ENGLISH} "AJP/1.3 Connector Port"
diff --git a/res/welcome.bin.html b/res/welcome.bin.html
index 7bc33dd..095c800 100644
--- a/res/welcome.bin.html
+++ b/res/welcome.bin.html
@@ -39,7 +39,7 @@ and must be untarred with a GNU compatible version of tar.
The version
of tar on Solaris and Mac OS X will not work with
these files.
-Tomcat @VERSION_MAJOR_MINOR@ requires Java SE 8 or
later. Read the
+Tomcat @VERSION_MAJOR_MINOR@ requires Java
@MIN_JAVA_VERSION@ or later. Read the
RELEASE-NOTES and the RUNNING.txt file in the distribution for more details.
diff --git a/res/welcome.main.html b/res/welcome.main.html
index 4598b2a..ff22030 100644
--- a/res/welcome.main.html
+++ b/res/welcome.main.html
@@ -39,7 +39,7 @@ and must be untarred with a GNU compatible version of tar.
The version
of tar on Solaris and Mac OS X will not work with
these files.
-Tomcat @VERSION_MAJOR_MINOR@ requires Java SE 8 or
later. Read the
+Tomcat @VERSION_MAJOR_MINOR@ requires Java
@MIN_JAVA_VERSION@ or later. Read the
RELEASE-NOTES and the RUNNING.txt file in the distribution for more details.
diff --git a/webapps/docs/appdev/installation.xml
b/webapps/docs/appdev/installation.xml
index 42aaee3..dd40ff5 100644
--- a/webapps/docs/appdev/installation.xml
+++ b/webapps/docs/appdev/installation.xml
@@ -39,7 +39,7 @@ in the following subsections.
-Tomcat was designed to run on Java SE 8 or later.
+Tomcat was designed to run on Java SE
or later.
Compatible JDKs for many platforms (or links to where they can be found)
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index aea333c..bd501d2 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -90,6 +90,11 @@
grant sufficient privileges to enable the uninstaller to execute when
user account control is active. (markt)
+
+Use a build property to define the minimum supported Java version and
+use that build property to reduce the number of edits required to
update
+the minimum supported Java version. (markt)
+
diff --git a/webapps/docs/cluster-howto.xml b/webapps/docs/cluster-howto.xml
index a385e40..cfbfc2f 100644
--- a/webapps/docs/cluster-howto.xml
+++ b/webapps/docs/cluster-howto.xml
@@ -626,7 +626,7 @@ should be completed:
Monitoring is a very important question wh
[tomcat] branch master updated (1cbb2ed -> 7099781)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git. from 1cbb2ed BZ63765: Try to unwrap first after handshake new 5444c16 Fix spacing new 6ee85f3 Align Java version references new f158418 Add Javadoc link for Servlet 4.0 new 7cc4af6 Update link to point to Java 8 javadoc new 70340d1 Parameterise minimum Java version new 280d058 Fix xml source file that wasn't using expected version replacement new 7099781 Fix xml source file that wasn't using expected version replacement The 7 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: RELEASE-NOTES| 2 +- RUNNING.txt | 2 +- build.xml| 18 +++--- res/tomcat.nsi | 2 +- res/welcome.bin.html | 2 +- res/welcome.main.html| 2 +- webapps/docs/appdev/installation.xml | 2 +- webapps/docs/appdev/processes.xml| 4 +- webapps/docs/changelog.xml | 5 ++ webapps/docs/cluster-howto.xml | 2 +- webapps/docs/default-servlet.xml | 116 +-- webapps/docs/index.xml | 7 +-- webapps/docs/logging.xml | 4 +- webapps/docs/setup.xml | 4 +- webapps/docs/tomcat-docs.xsl | 4 ++ 15 files changed, 92 insertions(+), 84 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 04/07: Update link to point to Java 8 javadoc
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 7cc4af6c27153b06f88257564b003af97e71d1c0 Author: Mark Thomas AuthorDate: Tue Sep 24 16:39:26 2019 +0100 Update link to point to Java 8 javadoc --- webapps/docs/logging.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webapps/docs/logging.xml b/webapps/docs/logging.xml index 1f546bb..b60744e 100644 --- a/webapps/docs/logging.xml +++ b/webapps/docs/logging.xml @@ -398,8 +398,8 @@ java.util.logging.ConsoleHandler.formatter = java.util.logging.OneLineFormatter] org.apache.juli package. -Oracle Java 6 Javadoc for the - http://docs.oracle.com/javase/6/docs/api/java/util/logging/package-summary.html";>java.util.logging +Oracle Java 8 Javadoc for the + https://docs.oracle.com/javase/8/docs/api/java/util/logging/package-summary.html";>java.util.logging package. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/06: Align Java version references
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit c24a6aeb1e35f02cc486ff16beff68aa2d3de7ba Author: Mark Thomas AuthorDate: Tue Sep 24 16:14:25 2019 +0100 Align Java version references --- build.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.xml b/build.xml index cfc2586..74e807f 100644 --- a/build.xml +++ b/build.xml @@ -84,9 +84,9 @@ - - - + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 04/06: Parameterise minimum Java version
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit ce4f6b7ff017bb841b782522147a9cbb05b81fd3
Author: Mark Thomas
AuthorDate: Tue Sep 24 17:00:31 2019 +0100
Parameterise minimum Java version
---
RELEASE-NOTES| 2 +-
RUNNING.txt | 2 +-
build.xml| 2 ++
res/tomcat.nsi | 2 +-
res/welcome.bin.html | 2 +-
res/welcome.main.html| 2 +-
webapps/docs/appdev/installation.xml | 2 +-
webapps/docs/changelog.xml | 5 +
webapps/docs/cluster-howto.xml | 2 +-
webapps/docs/setup.xml | 4 ++--
webapps/docs/tomcat-docs.xsl | 4
11 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index d9cc4af..0a36824 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -38,7 +38,7 @@ CONTENTS:
===
Dependency Changes:
===
-Tomcat @VERSION_MAJOR_MINOR@ is designed to run on Java SE 7 and later.
+Tomcat @VERSION_MAJOR_MINOR@ is designed to run on Java @MIN_JAVA_VERSION@ and
later.
==
diff --git a/RUNNING.txt b/RUNNING.txt
index c7f59b9..b34e1c7 100644
--- a/RUNNING.txt
+++ b/RUNNING.txt
@@ -157,7 +157,7 @@ create the following script file:
On Windows, %CATALINA_BASE%\bin\setenv.bat:
- set "JRE_HOME=%ProgramFiles%\Java\jre7"
+ set "JRE_HOME=%ProgramFiles%\Java\jre@MIN_JAVA_VERSION@"
exit /b 0
On *nix, $CATALINA_BASE/bin/setenv.sh:
diff --git a/build.xml b/build.xml
index 74e807f..c274aab 100644
--- a/build.xml
+++ b/build.xml
@@ -88,6 +88,7 @@
+
@@ -247,6 +248,7 @@
+
diff --git a/res/tomcat.nsi b/res/tomcat.nsi
index d6255b4..5ab5f60 100644
--- a/res/tomcat.nsi
+++ b/res/tomcat.nsi
@@ -132,7 +132,7 @@ Var ServiceInstallLog
LangString TEXT_CONF_SUBTITLE ${LANG_ENGLISH} "Tomcat basic configuration."
LangString TEXT_CONF_PAGETITLE ${LANG_ENGLISH} ": Configuration Options"
- LangString TEXT_JVM_LABEL1 ${LANG_ENGLISH} "Please select the path of a Java
SE 7.0 or later JRE installed on your system."
+ LangString TEXT_JVM_LABEL1 ${LANG_ENGLISH} "Please select the path of a Java
@MIN_JAVA_VERSION@ or later JRE installed on your system."
LangString TEXT_CONF_LABEL_PORT_SHUTDOWN ${LANG_ENGLISH} "Server Shutdown
Port"
LangString TEXT_CONF_LABEL_PORT_HTTP ${LANG_ENGLISH} "HTTP/1.1 Connector
Port"
LangString TEXT_CONF_LABEL_PORT_AJP ${LANG_ENGLISH} "AJP/1.3 Connector Port"
diff --git a/res/welcome.bin.html b/res/welcome.bin.html
index 19c7f09..64df248 100644
--- a/res/welcome.bin.html
+++ b/res/welcome.bin.html
@@ -39,7 +39,7 @@ and must be untarred with a GNU compatible version of tar.
The version
of tar on Solaris and Mac OS X will not work with
these files.
-Tomcat @VERSION_MAJOR_MINOR@ requires Java SE 7 or
later. Read the
+Tomcat @VERSION_MAJOR_MINOR@ requires Java
@MIN_JAVA_VERSION@ or later. Read the
RELEASE-NOTES and the RUNNING.txt file in the distribution for more details.
diff --git a/res/welcome.main.html b/res/welcome.main.html
index 9ce29f2..c4c2a34 100644
--- a/res/welcome.main.html
+++ b/res/welcome.main.html
@@ -39,7 +39,7 @@ and must be untarred with a GNU compatible version of tar.
The version
of tar on Solaris and Mac OS X will not work with
these files.
-Tomcat @VERSION_MAJOR_MINOR@ requires Java SE 7 or
later. Read the
+Tomcat @VERSION_MAJOR_MINOR@ requires Java
@MIN_JAVA_VERSION@ or later. Read the
RELEASE-NOTES and the RUNNING.txt file in the distribution for more details.
diff --git a/webapps/docs/appdev/installation.xml
b/webapps/docs/appdev/installation.xml
index c1925e8..01d032a 100644
--- a/webapps/docs/appdev/installation.xml
+++ b/webapps/docs/appdev/installation.xml
@@ -39,7 +39,7 @@ in the following subsections.
-Tomcat was designed to run on Java SE 7 or later.
+Tomcat was designed to run on Java
or later.
Compatible JDKs for many platforms (or links to where they can be found)
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index b0a824d..2b5f84a 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -83,6 +83,11 @@
grant sufficient privileges to enable the uninstaller to execute when
user account control is active. (markt)
+
+Use a build property to define the minimum supported Java version and
+use that build property to reduce the number of edits required to
update
+the minimum supported Java version. (markt)
+
diff --git a/webapps/docs/cluster-howto.xml b/webapps/docs/cluster-howto.xml
index cd4e88b..cce6726 100644
--- a/webapps/docs/cluster-howto.xml
+++ b/webapps/docs/cluster-howto.xml
@@ -614,7 +614,7 @@ should be completed:
Monitoring is a very important question when y
[tomcat] branch 8.5.x updated (da37f36 -> 39bcbd0)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git. from da37f36 https://bz.apache.org/bugzilla/show_bug.cgi?id=63759 Uninstaller & UAC new 4e984dc Polish. Align spacing, remove svn (and cvs!) references new c24a6ae Align Java version references new c8ddc6f Update link to point to Java 7 javadoc new ce4f6b7 Parameterise minimum Java version new c9f3362 Fix xml source file that wasn't using expected version replacement new 39bcbd0 Fix xml source file that wasn't using expected version replacement The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: RELEASE-NOTES| 2 +- RUNNING.txt | 2 +- build.xml| 36 +-- res/tomcat.nsi | 2 +- res/welcome.bin.html | 2 +- res/welcome.main.html| 2 +- webapps/docs/appdev/installation.xml | 2 +- webapps/docs/appdev/processes.xml| 4 +- webapps/docs/changelog.xml | 5 ++ webapps/docs/cluster-howto.xml | 2 +- webapps/docs/default-servlet.xml | 116 +-- webapps/docs/logging.xml | 4 +- webapps/docs/setup.xml | 4 +- webapps/docs/tomcat-docs.xsl | 4 ++ 14 files changed, 97 insertions(+), 90 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/06: Polish. Align spacing, remove svn (and cvs!) references
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 4e984dc3ab1d4667707bedd667eaa30927e69eda
Author: Mark Thomas
AuthorDate: Tue Sep 24 16:10:25 2019 +0100
Polish. Align spacing, remove svn (and cvs!) references
---
build.xml | 28
1 file changed, 12 insertions(+), 16 deletions(-)
diff --git a/build.xml b/build.xml
index 63d7989..cfc2586 100644
--- a/build.xml
+++ b/build.xml
@@ -42,17 +42,17 @@
-
+
-
-
-
-
+
+
+
+
-
+
-
+
@@ -624,7 +624,6 @@
source="${compile.source}"
target="${compile.target}"
release="${compile.release}"
- excludes="**/.svn/**"
encoding="ISO-8859-1"
includeAntRuntime="true" >
[tomcat] 03/06: Update link to point to Java 7 javadoc
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit c8ddc6fb484d572cf879adf5ca540901e0b8fb50 Author: Mark Thomas AuthorDate: Tue Sep 24 17:11:19 2019 +0100 Update link to point to Java 7 javadoc --- webapps/docs/logging.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webapps/docs/logging.xml b/webapps/docs/logging.xml index 95ab76d..33ea117 100644 --- a/webapps/docs/logging.xml +++ b/webapps/docs/logging.xml @@ -398,8 +398,8 @@ java.util.logging.ConsoleHandler.formatter = java.util.logging.OneLineFormatter] org.apache.juli package. -Oracle Java 6 Javadoc for the - http://docs.oracle.com/javase/6/docs/api/java/util/logging/package-summary.html";>java.util.logging +Oracle Java 7 Javadoc for the + https://docs.oracle.com/javase/7/docs/api/java/util/logging/package-summary.html";>java.util.logging package. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 06/06: Fix xml source file that wasn't using expected version replacement
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 39bcbd0c5474f73ad0110aa0de6246493495c1c1 Author: Mark Thomas AuthorDate: Tue Sep 24 17:07:55 2019 +0100 Fix xml source file that wasn't using expected version replacement Source block is xml so need to xml escape so we can remove the CDATA allowing the version replacement to work. --- webapps/docs/default-servlet.xml | 116 +++ 1 file changed, 58 insertions(+), 58 deletions(-) diff --git a/webapps/docs/default-servlet.xml b/webapps/docs/default-servlet.xml index d849618..ef01b8f 100644 --- a/webapps/docs/default-servlet.xml +++ b/webapps/docs/default-servlet.xml @@ -229,23 +229,23 @@ Format: The following is a sample xsl file which mimics the default tomcat behavior: - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 05/06: Fix xml source file that wasn't using expected version replacement
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit c9f33626a59d4d6bdd9ae0578904c3988b4c787f Author: Mark Thomas AuthorDate: Tue Sep 24 17:07:18 2019 +0100 Fix xml source file that wasn't using expected version replacement No special characters used in the source block so just remove the CDATA --- webapps/docs/appdev/processes.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webapps/docs/appdev/processes.xml b/webapps/docs/appdev/processes.xml index 6138b42..276e868 100644 --- a/webapps/docs/appdev/processes.xml +++ b/webapps/docs/appdev/processes.xml @@ -126,7 +126,7 @@ the sample build.xml script. At a minimum, you will generally need to define the catalina.home property defining where Tomcat is installed, and the manager application username and password. You might end up with something like this: - +manager.password=mypassword In general, you will not want to check the build.properties file in to the CVS repository, because it - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: BZ63765: Try to unwrap first after handshake
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 993e80e BZ63765: Try to unwrap first after handshake
993e80e is described below
commit 993e80e0be6fc93fae7e253621eec4a29ac6893f
Author: remm
AuthorDate: Tue Sep 24 18:22:48 2019 +0200
BZ63765: Try to unwrap first after handshake
This seems to only be an issue right after the handshake.
---
java/org/apache/tomcat/util/net/SecureNio2Channel.java | 3 ++-
webapps/docs/changelog.xml | 4
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/net/SecureNio2Channel.java
b/java/org/apache/tomcat/util/net/SecureNio2Channel.java
index 11f31a0..9f71e0a 100644
--- a/java/org/apache/tomcat/util/net/SecureNio2Channel.java
+++ b/java/org/apache/tomcat/util/net/SecureNio2Channel.java
@@ -66,7 +66,7 @@ public class SecureNio2Channel extends Nio2Channel {
private volatile boolean handshakeComplete;
private volatile HandshakeStatus handshakeStatus; //gets set by handshake
-private volatile boolean unwrapBeforeRead = false;
+private volatile boolean unwrapBeforeRead;
protected boolean closed;
protected boolean closing;
@@ -130,6 +130,7 @@ public class SecureNio2Channel extends Nio2Channel {
sslEngine = null;
sniComplete = false;
handshakeComplete = false;
+unwrapBeforeRead = true;
closed = false;
closing = false;
netInBuffer.clear();
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 2b5f84a..58e7569 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -52,6 +52,10 @@
generating or parsing the HTTP2-Settings header as part of
an HTTP upgrade to h2c as required by RFC 7540. (markt)
+
+63765: NIO2 should try to unwrap after TLS handshake to
+avoid edge cases. (remm)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 63765] NIO2 Connector with OpenSSL 1.1.1 hangs with TLSv1.3
https://bz.apache.org/bugzilla/show_bug.cgi?id=63765 Remy Maucherat changed: What|Removed |Added Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #8 from Remy Maucherat --- The fix will be in 9.0.27 and 8.5.47. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-trunk/builds/4625 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch master] 709978183d763b27009b0d02908ae1eda50308dd Blamelist: Mark Thomas ,remm 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
[tomcat] 02/05: Align Java version references
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 7.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit e15f4b983f67fb96e4ffeffbf9cd90e65bc6ada9 Author: Mark Thomas AuthorDate: Tue Sep 24 16:14:37 2019 +0100 Align Java version references --- build.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.xml b/build.xml index ea93aaa..0cfed2c 100644 --- a/build.xml +++ b/build.xml @@ -80,9 +80,9 @@ - - - + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 03/05: Parameterise minimum Java version
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit dd0cc250e4b2f671e9e4aecf7d56a6bce45b77a0
Author: Mark Thomas
AuthorDate: Tue Sep 24 17:00:31 2019 +0100
Parameterise minimum Java version
---
RELEASE-NOTES| 2 +-
RUNNING.txt | 2 +-
build.xml| 2 ++
res/tomcat.nsi | 2 +-
res/welcome.bin.html | 4 ++--
res/welcome.main.html| 4 ++--
webapps/docs/appdev/installation.xml | 2 +-
webapps/docs/changelog.xml | 5 +
webapps/docs/cluster-howto.xml | 2 +-
webapps/docs/setup.xml | 4 ++--
webapps/docs/tomcat-docs.xsl | 4
11 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 7024160..ebf045c 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -41,7 +41,7 @@ CONTENTS:
===
Dependency Changes:
===
-Tomcat @VERSION_MAJOR_MINOR@ is designed to run on Java SE 6 and later.
+Tomcat @VERSION_MAJOR_MINOR@ is designed to run on Java @MIN_JAVA_VERSION@ and
later.
In addition, Tomcat @VERSION_MAJOR_MINOR@ uses the Eclipse JDT Java compiler
for
compiling JSP pages. This means you no longer need to have the complete
diff --git a/RUNNING.txt b/RUNNING.txt
index b50a0e2..b74ab6a 100644
--- a/RUNNING.txt
+++ b/RUNNING.txt
@@ -172,7 +172,7 @@ create the following script file:
On Windows, %CATALINA_BASE%\bin\setenv.bat:
- set "JRE_HOME=%ProgramFiles%\Java\jre6"
+ set "JRE_HOME=%ProgramFiles%\Java\jre@MIN_JAVA_VERSION@"
exit /b 0
On *nix, $CATALINA_BASE/bin/setenv.sh:
diff --git a/build.xml b/build.xml
index 0cfed2c..0b2b8d2 100644
--- a/build.xml
+++ b/build.xml
@@ -83,6 +83,7 @@
+
@@ -249,6 +250,7 @@
+
diff --git a/res/tomcat.nsi b/res/tomcat.nsi
index f2c9077..b8d1a5b 100644
--- a/res/tomcat.nsi
+++ b/res/tomcat.nsi
@@ -132,7 +132,7 @@ Var ServiceInstallLog
LangString TEXT_CONF_SUBTITLE ${LANG_ENGLISH} "Tomcat basic configuration."
LangString TEXT_CONF_PAGETITLE ${LANG_ENGLISH} ": Configuration Options"
- LangString TEXT_JVM_LABEL1 ${LANG_ENGLISH} "Please select the path of a Java
SE 6.0 or later JRE installed on your system."
+ LangString TEXT_JVM_LABEL1 ${LANG_ENGLISH} "Please select the path of a Java
@MIN_JAVA_VERSION@ or later JRE installed on your system."
LangString TEXT_CONF_LABEL_PORT_SHUTDOWN ${LANG_ENGLISH} "Server Shutdown
Port"
LangString TEXT_CONF_LABEL_PORT_HTTP ${LANG_ENGLISH} "HTTP/1.1 Connector
Port"
LangString TEXT_CONF_LABEL_PORT_AJP ${LANG_ENGLISH} "AJP/1.3 Connector Port"
diff --git a/res/welcome.bin.html b/res/welcome.bin.html
index 214bb06..4e354b5 100644
--- a/res/welcome.bin.html
+++ b/res/welcome.bin.html
@@ -34,9 +34,9 @@ and must be untarred with a GNU compatible version of tar.
The version
of tar on Solaris and Mac OS X will not work with
these files.
-Tomcat @VERSION_MAJOR_MINOR@ requires Java SE 6 or later.
Read the
+Tomcat @VERSION_MAJOR_MINOR@ requires Java
@MIN_JAVA_VERSION@ or later. Read the
RELEASE-NOTES and the RUNNING.txt file in the distribution for more details.
-
+
Packaging Details (or "What Should I Download?")
diff --git a/res/welcome.main.html b/res/welcome.main.html
index 0ab79da..b4cfecf 100644
--- a/res/welcome.main.html
+++ b/res/welcome.main.html
@@ -34,9 +34,9 @@ and must be untarred with a GNU compatible version of tar.
The version
of tar on Solaris and Mac OS X will not work with
these files.
-Tomcat @VERSION_MAJOR_MINOR@ requires Java SE 6 or later.
Read the
+Tomcat @VERSION_MAJOR_MINOR@ requires Java
@MIN_JAVA_VERSION@ or later. Read the
RELEASE-NOTES and the RUNNING.txt file in the distribution for more details.
-
+
Packaging Details (or "What Should I Download?")
diff --git a/webapps/docs/appdev/installation.xml
b/webapps/docs/appdev/installation.xml
index 8ac111d..c2fd470 100644
--- a/webapps/docs/appdev/installation.xml
+++ b/webapps/docs/appdev/installation.xml
@@ -39,7 +39,7 @@ in the following subsections.
-Tomcat 7.0 was designed to run on Java SE 6.
+Tomcat was designed to run on Java
or later.
Compatible JDKs for many platforms (or links to where they can be found)
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index a352705..6d6812e 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -279,6 +279,11 @@
grant sufficient privileges to enable the uninstaller to execute when
user account control is active. (markt)
+
+Use a build property to define the minimum supported Java version and
+use that build property to reduce the number of edits required to
update
+the minimum supported Java version. (markt)
+
diff --git a/webapps/docs
[tomcat] branch 7.0.x updated (664e5e1 -> e2ce8c9)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 7.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git. from 664e5e1 https://bz.apache.org/bugzilla/show_bug.cgi?id=63759 Uninstaller & UAC new 7322990 Polish. Fix spacing. Remove svn & cvs references. Align with 8.5.x. new e15f4b9 Align Java version references new dd0cc25 Parameterise minimum Java version new 97aebf8 Fix xml source file that wasn't using expected version replacement new e2ce8c9 Fix xml source file that wasn't using expected version replacement The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: RELEASE-NOTES| 2 +- RUNNING.txt | 2 +- build.xml| 36 +-- res/tomcat.nsi | 2 +- res/welcome.bin.html | 4 +- res/welcome.main.html| 4 +- webapps/docs/appdev/installation.xml | 2 +- webapps/docs/appdev/processes.xml| 4 +- webapps/docs/changelog.xml | 5 ++ webapps/docs/cluster-howto.xml | 2 +- webapps/docs/default-servlet.xml | 116 +-- webapps/docs/setup.xml | 4 +- webapps/docs/tomcat-docs.xsl | 4 ++ 13 files changed, 97 insertions(+), 90 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/05: Polish. Fix spacing. Remove svn & cvs references. Align with 8.5.x.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 73229901a7d575b729e54c8ddf2417bb493f5da0
Author: Mark Thomas
AuthorDate: Tue Sep 24 16:11:18 2019 +0100
Polish. Fix spacing. Remove svn & cvs references. Align with 8.5.x.
---
build.xml | 28
1 file changed, 12 insertions(+), 16 deletions(-)
diff --git a/build.xml b/build.xml
index 8fbe02d..ea93aaa 100644
--- a/build.xml
+++ b/build.xml
@@ -42,15 +42,15 @@
-
+
-
-
-
-
+
+
+
+
-
+
@@ -620,7 +620,6 @@
deprecation="${compile.deprecation}"
source="${compile.source}"
target="${compile.target}"
- excludes="**/.svn/**"
encoding="ISO-8859-1"
includeAntRuntime="true" >
@@ -674,7 +673,6 @@
deprecation="${compile.deprecation}"
source="${compile.source}"
target="${compile.target}"
- excludes="**/.svn/**"
encoding="ISO-8859-1"
includeAntRuntime="true" >
@@ -1162,7 +1160,6 @@
source="${compile.source}"
target="${compile.target}"
classpath="${tomcat.classes}"
- excludes="**/CVS/**,**/.svn/**"
encoding="ISO-8859-1"
includeantruntime="false">
@@ -1174,7 +1171,6 @@
source="${compile.source}"
target="${compile.target}"
classpath="${tomcat.classes}"
- excludes="**/CVS/**,**/.svn/**"
encoding="ISO-8859-1"
includeantruntime="false">
@@ -2923,7 +2919,7 @@ skip.installer property in build.properties" />
-
+
@@ -2941,7 +2937,7 @@ skip.installer property in build.properties" />
-
+
@@ -3121,7 +3117,7 @@ skip.installer property in build.properties" />
-
+
@@ -3138,7 +3134,7 @@ skip.installer property in build.properties" />
-
+
@@ -3163,7 +3159,7 @@ skip.installer property in build.properties" />
-
+
@@ -3203,7 +3199,7 @@ skip.installer property in build.properties" />
-
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 05/05: Fix xml source file that wasn't using expected version replacement
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 7.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit e2ce8c9f6af7d0850363927c6eefd1d502c90357 Author: Mark Thomas AuthorDate: Tue Sep 24 17:07:55 2019 +0100 Fix xml source file that wasn't using expected version replacement Source block is xml so need to xml escape so we can remove the CDATA allowing the version replacement to work. --- webapps/docs/default-servlet.xml | 116 +++ 1 file changed, 58 insertions(+), 58 deletions(-) diff --git a/webapps/docs/default-servlet.xml b/webapps/docs/default-servlet.xml index 38ef059..a705bac 100644 --- a/webapps/docs/default-servlet.xml +++ b/webapps/docs/default-servlet.xml @@ -203,23 +203,23 @@ Format: The following is a sample xsl file which mimics the default tomcat behavior: - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 04/05: Fix xml source file that wasn't using expected version replacement
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 7.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 97aebf8c4dbf8e0cd31d690e227a24d15a6c4bb9 Author: Mark Thomas AuthorDate: Tue Sep 24 17:07:18 2019 +0100 Fix xml source file that wasn't using expected version replacement No special characters used in the source block so just remove the CDATA --- webapps/docs/appdev/processes.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webapps/docs/appdev/processes.xml b/webapps/docs/appdev/processes.xml index bd9af1d..5620c74 100644 --- a/webapps/docs/appdev/processes.xml +++ b/webapps/docs/appdev/processes.xml @@ -126,7 +126,7 @@ the sample build.xml script. At a minimum, you will generally need to define the catalina.home property defining where Tomcat is installed, and the manager application username and password. You might end up with something like this: - +manager.password=mypassword In general, you will not want to check the build.properties file in to the CVS repository, because it - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: buildbot failure in on tomcat-trunk
On 24/09/2019 17:36, build...@apache.org wrote: > The Buildbot has detected a new failure on builder tomcat-trunk while > building tomcat. Full details are available at: > https://ci.apache.org/builders/tomcat-trunk/builds/4625 > > Buildbot URL: https://ci.apache.org/ > > Buildslave for this Build: asf946_ubuntu > > Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' > triggered this build > Build Source Stamp: [branch master] 709978183d763b27009b0d02908ae1eda50308dd > Blamelist: Mark Thomas ,remm > > BUILD FAILED: failed compile_1 This is back now I have reverted the incorrect that just changed the timing enough to reduce the chances of this. Still working on a proper fix. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 63759] Unable to launch uninstaller: insufficient permissions to access Uninstall.exe
https://bz.apache.org/bugzilla/show_bug.cgi?id=63759 Mark Thomas changed: What|Removed |Added Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #3 from Mark Thomas --- Fixed in: - master for 9.0.27 onwards - 8.5.x for 8.5.47 onwards - 7.0.x for 7.0.97 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
buildbot success in on tomcat-7-trunk
The Buildbot has detected a restored build on builder tomcat-7-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-7-trunk/builds/1461 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' triggered this build Build Source Stamp: [branch 7.0.x] e2ce8c9f6af7d0850363927c6eefd1d502c90357 Blamelist: Mark Thomas Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Correct version info in comment
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new fb07e2c Correct version info in comment
fb07e2c is described below
commit fb07e2c5176f642d7893eaa91a05b93aed8c43a3
Author: Mark Thomas
AuthorDate: Tue Sep 24 18:47:53 2019 +0100
Correct version info in comment
---
build.properties.default | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index bd04c89..c9a3625 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -129,9 +129,9 @@
wsdl4j-lib.loc=${base-maven.loc}/wsdl4j/wsdl4j/${wsdl4j-lib.version}/wsdl4j-${ws
# - Eclipse JDT, version 4.7 or later -#
# See
https://cwiki.apache.org/confluence/display/TOMCAT/Managing+Tomcat%27s+Dependency+on+the+Eclipse+JDT+Core+Batch+Compiler
#
-# Checksum is from "SHA512 Checksums for 4.10" link at
-# http://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/
-#
http://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/checksum/eclipse-4.10-SUMSSHA512
+# Checksum is from "SHA512 Checksums for 4.12" link at
+# http://download.eclipse.org/eclipse/downloads/drops4/R-4.12-201906051800/
+#
http://download.eclipse.org/eclipse/downloads/drops4/R-4.12-201906051800/checksum/eclipse-4.12-SUMSSHA512
#
jdt.version=4.12
jdt.release=R-4.12-201906051800/
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: JDT 4.12 has a constant for Java 12. Use it.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new e0ffafa JDT 4.12 has a constant for Java 12. Use it.
e0ffafa is described below
commit e0ffafab9cc1e988e35b5cef120815340b451ea0
Author: Mark Thomas
AuthorDate: Tue Sep 24 18:55:18 2019 +0100
JDT 4.12 has a constant for Java 12. Use it.
---
java/org/apache/jasper/compiler/JDTCompiler.java | 15 ++-
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java
b/java/org/apache/jasper/compiler/JDTCompiler.java
index 33955d4..9b0e0fe 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -325,10 +325,8 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_11);
} else if(opt.equals("12")) {
-// Constant not available in latest ECJ version shipped with
-// Tomcat. May be supported in a snapshot build.
-// This is checked against the actual version below.
-settings.put(CompilerOptions.OPTION_Source, "12");
+settings.put(CompilerOptions.OPTION_Source,
+ CompilerOptions.VERSION_12);
} else if(opt.equals("13")) {
// Constant not available in latest ECJ version shipped with
// Tomcat. May be supported in a snapshot build.
@@ -398,11 +396,10 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
settings.put(CompilerOptions.OPTION_Compliance,
CompilerOptions.VERSION_11);
} else if(opt.equals("12")) {
-// Constant not available in latest ECJ version shipped with
-// Tomcat. May be supported in a snapshot build.
-// This is checked against the actual version below.
-settings.put(CompilerOptions.OPTION_TargetPlatform, "12");
-settings.put(CompilerOptions.OPTION_Compliance, "12");
+settings.put(CompilerOptions.OPTION_TargetPlatform,
+CompilerOptions.VERSION_12);
+settings.put(CompilerOptions.OPTION_Compliance,
+CompilerOptions.VERSION_12);
} else if(opt.equals("13")) {
// Constant not available in latest ECJ version shipped with
// Tomcat. May be supported in a snapshot build.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Update Eclipse JDT compiler to 4.13
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new fc1891b Update Eclipse JDT compiler to 4.13
fc1891b is described below
commit fc1891bbc865bfc489b110fe1f41e010e811e11c
Author: Mark Thomas
AuthorDate: Tue Sep 24 19:08:32 2019 +0100
Update Eclipse JDT compiler to 4.13
---
build.properties.default| 12 ++--
res/ide-support/eclipse/eclipse.classpath | 2 +-
res/ide-support/idea/tomcat.iml | 4 ++--
res/ide-support/netbeans/nb-tomcat-build.properties | 2 +-
res/ide-support/netbeans/project.xml| 4 ++--
webapps/docs/changelog.xml | 7 +++
6 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index c9a3625..c3c7d60 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -129,15 +129,15 @@
wsdl4j-lib.loc=${base-maven.loc}/wsdl4j/wsdl4j/${wsdl4j-lib.version}/wsdl4j-${ws
# - Eclipse JDT, version 4.7 or later -#
# See
https://cwiki.apache.org/confluence/display/TOMCAT/Managing+Tomcat%27s+Dependency+on+the+Eclipse+JDT+Core+Batch+Compiler
#
-# Checksum is from "SHA512 Checksums for 4.12" link at
-# http://download.eclipse.org/eclipse/downloads/drops4/R-4.12-201906051800/
-#
http://download.eclipse.org/eclipse/downloads/drops4/R-4.12-201906051800/checksum/eclipse-4.12-SUMSSHA512
+# Checksum is from "SHA512 Checksums for 4.13" link at
+# http://download.eclipse.org/eclipse/downloads/drops4/R-4.13-201909161045/
+#
http://download.eclipse.org/eclipse/downloads/drops4/R-4.13-201909161045/checksum/eclipse-4.13-SUMSSHA512
#
-jdt.version=4.12
-jdt.release=R-4.12-201906051800/
+jdt.version=4.13
+jdt.release=R-4.13-201909161045/
jdt.checksum.enabled=true
jdt.checksum.algorithm=SHA-512
-jdt.checksum.value=7d38921ae374a5112e7ed5596d85955b608ddf74849373d7a74b199961514807e749d8c8cad89871fa1fdd5e14bc6ec471665546a9f8d313da5c963589c307b0
+jdt.checksum.value=d608e4b7fc9b061e327ad5c39112c032e310a48c57ddd01c9349f2be8f5ce4d3d0c3862b6b5cc105220a06a6dd62c477de654b9fbe6f4c8a3d3de816e5de19f7
jdt.home=${base.path}/ecj-${jdt.version}
jdt.jar=${jdt.home}/ecj-${jdt.version}.jar
# The download will be moved to the archive area eventually. We are taking
care of that in advance.
diff --git a/res/ide-support/eclipse/eclipse.classpath
b/res/ide-support/eclipse/eclipse.classpath
index e5c20dd..c038e17 100644
--- a/res/ide-support/eclipse/eclipse.classpath
+++ b/res/ide-support/eclipse/eclipse.classpath
@@ -24,7 +24,7 @@
-
+
diff --git a/res/ide-support/idea/tomcat.iml b/res/ide-support/idea/tomcat.iml
index 0d63edc..4973d0a 100644
--- a/res/ide-support/idea/tomcat.iml
+++ b/res/ide-support/idea/tomcat.iml
@@ -30,7 +30,7 @@
-
+
@@ -70,7 +70,7 @@
-
+
diff --git a/res/ide-support/netbeans/nb-tomcat-build.properties
b/res/ide-support/netbeans/nb-tomcat-build.properties
index fa28089..c6c66fa 100644
--- a/res/ide-support/netbeans/nb-tomcat-build.properties
+++ b/res/ide-support/netbeans/nb-tomcat-build.properties
@@ -37,7 +37,7 @@ nb-test.io-method=org.apache.coyote.http11.Http11NioProtocol
# it is not possible to retrieve the classpaths from the build to
# use in the NetBeans targets, so they must be explicitly declared
-nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.11/junit-4.11.jar:${base.path}/easymock-3.2/easymock-3.2.jar:${base.path}/hamcrest-1.3/hamcrest-core-1.3.jar:${base.path}/ecj-4.12/ecj-4.12.jar:${tomcat.classes}
+nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.11/junit-4.11.jar:${base.path}/easymock-3.2/easymock-3.2.jar:${base.path}/hamcrest-1.3/hamcrest-core-1.3.jar:${base.path}/ecj-4.13/ecj-4.13.jar:${tomcat.classes}
# Extra properties used by the Tomcat project additional NetBeans targets.
diff --git a/res/ide-support/netbeans/project.xml
b/res/ide-support/netbeans/project.xml
index 850006b..8cb521e 100644
--- a/res/ide-support/netbeans/project.xml
+++ b/res/ide-support/netbeans/project.xml
@@ -178,7 +178,7 @@
-->
java
-${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.3/wsdl4j-1.6.3.jar:${base.path}/ecj-4.12/ecj-4.12.jar:${ant.includes}/
+${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.3/wsdl4j-1.6.3.jar:${base.path}/ecj-4.13/ecj-4.13.jar:${ant.includes}/
1.7
@@ -189,7 +189,7 @@
test
buildbot success in on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-trunk/builds/4626 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch master] e0ffafab9cc1e988e35b5cef120815340b451ea0 Blamelist: Mark Thomas Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 63767] install windows service, tomcat9 start crash.
https://bz.apache.org/bugzilla/show_bug.cgi?id=63767 Mark Thomas changed: What|Removed |Added Status|NEW |NEEDINFO --- Comment #2 from Mark Thomas --- To investigate this we'll need the steps to reproduce this on a clean install of the latest Tomcat 9.0.x release. That you see different behaviour on different Windows 2012 systems suggests there is some factor external to Tomcat that is involved. Some things to try/investigate: - ensure all machines are fully patched - on servers where this fails does a clean install with no additional configuration fail? - enable debug logging for Commons Daemon -- 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 63766] Resource leak: under certain conditions, request objects related to WebSockets are not freed
https://bz.apache.org/bugzilla/show_bug.cgi?id=63766 Mark Thomas changed: What|Removed |Added OS||All Status|NEW |NEEDINFO --- Comment #1 from Mark Thomas --- Please re-test this with the latest 8.5.x release (8.5.46 as I type this) and confirm whether or not this resolves the issue. If it does not resolve the issue please update the test case and we will investigate. -- 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 63685] WebappClassLoaderBase and StandardRoot reload classes from jar files on each call of getResource, getResourceAsStream and etc. that hit application startup performance
https://bz.apache.org/bugzilla/show_bug.cgi?id=63685 --- Comment #4 from Mark Thomas --- (In reply to Andrei Ivanov from comment #3) > I remember having a problem with AOP and load time weaving where Tomcat was > scanning the WAR for servlet annotations and caching the classes so by the > time the app was starting and LTW enabled, the classloader was returning the > cached classes instead of passing them through the instrumentation agent, That is a known issue with the Servlet spec: https://github.com/eclipse-ee4j/servlet-api/issues/79 This bug report is still waiting for a justification for caching the content of class files. -- 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 63766] Resource leak: under certain conditions, request objects related to WebSockets are not freed
https://bz.apache.org/bugzilla/show_bug.cgi?id=63766 --- Comment #2 from Francis VAN AEKEN --- Created attachment 36798 --> https://bz.apache.org/bugzilla/attachment.cgi?id=36798&action=edit Application code, using embedded Tomcat 8.5.46 -- 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 63766] Resource leak: under certain conditions, request objects related to WebSockets are not freed
https://bz.apache.org/bugzilla/show_bug.cgi?id=63766 Francis VAN AEKEN changed: What|Removed |Added Status|NEEDINFO|NEW --- Comment #3 from Francis VAN AEKEN --- We have retested using Tomcat 8.5.46 (new code attached), and could still reproduce the problem, following the steps below. Start the Tomcat application Start the proxy Start the test client (SadPath) Wait for 20 minutes Shut down the client Shut down the proxy Take a heapdump of the Tomcat application In the heapdump, observe 100+ instances of each of the classes below org.apache.coyote.Request org.apache.catalina.connector.Request org.apache.coyote.RequestInfo org.apache.tomcat.websocket.server.WsHandshakeRequest org.apache.catalina.connector.RequestFacade -- 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 63766] Resource leak: under certain conditions, request objects related to WebSockets are not freed
https://bz.apache.org/bugzilla/show_bug.cgi?id=63766 Francis VAN AEKEN changed: What|Removed |Added Version|8.5.38 |8.5.46 -- 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 63767] install windows service, tomcat9 start crash.
https://bz.apache.org/bugzilla/show_bug.cgi?id=63767 王化亮 <6900...@qq.com> changed: What|Removed |Added Status|NEEDINFO|NEW --- Comment #3 from 王化亮 <6900...@qq.com> --- 1.i fresh install windows 2012 x64, use this image. en_windows_server_2012_vl_x64_dvd_917758.iso 2.install jdk1.8_201, set java_home 3.download tomcat9.0.26, unzip to C:\apache-tomcat-9.0.26 4.run service.bat install 5.start tomcat9 service. it is crashed. the common daemon debug log is: [2019-09-24 19:47:12] [debug] ( prunsrv.c:1754) [ 1012] Apache Commons Daemon procrun log initialized. [2019-09-24 19:47:12] [info] ( prunsrv.c:1758) [ 1012] Apache Commons Daemon procrun (1.2.1.0 64-bit) started. [2019-09-24 19:47:12] [info] ( prunsrv.c:1668) [ 1012] Running Service 'Tomcat9'... [2019-09-24 19:47:12] [debug] ( prunsrv.c:1441) [ 1680] Inside ServiceMain... [2019-09-24 19:47:12] [debug] ( prunsrv.c:904 ) [ 1680] reportServiceStatusE: dwCurrentState = 2, dwWin32ExitCode = 0, dwWaitHint = 3000, dwServiceSpecificExitCode = 0. [2019-09-24 19:47:12] [info] ( prunsrv.c:1196) [ 1680] Starting service... [2019-09-24 19:47:12] [debug] ( javajni.c:216 ) [ 1680] Explicit RuntimeLib specified 'C:\Program Files\Java\jdk1.8.0_201\jre\bin\server\jvm.dll' windows event log: Faulting application name: Tomcat9.exe, version: 1.2.1.0, time stamp: 0x5d6fdd78 Faulting module name: unknown, version: 0.0.0.0, time stamp: 0x Exception code: 0xc005 Fault offset: 0x01310f28 Faulting process id: 0xb44 Faulting application start time: 0x01d5734b8850d80a Faulting application path: C:\apache-tomcat-9.0.26\bin\Tomcat9.exe Faulting module path: unknown Report Id: c6048720-df3e-11e9-93ea-0050568abc2e Faulting package full name: Faulting package-relative application ID: -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: fix comment
This is an automated email from the ASF dual-hosted git repository. kfujino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/master by this push: new dd2faec fix comment dd2faec is described below commit dd2faecf717b852de31e33f69c6be2844fbaea78 Author: KeiichiFujino AuthorDate: Wed Sep 25 15:16:14 2019 +0900 fix comment --- java/org/apache/catalina/tribes/membership/StaticMembershipService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/org/apache/catalina/tribes/membership/StaticMembershipService.java b/java/org/apache/catalina/tribes/membership/StaticMembershipService.java index d3d91a1..299b961 100644 --- a/java/org/apache/catalina/tribes/membership/StaticMembershipService.java +++ b/java/org/apache/catalina/tribes/membership/StaticMembershipService.java @@ -43,7 +43,7 @@ public class StaticMembershipService extends MembershipServiceBase private StaticMembershipProvider provider; /** - * the ObjectName of this McastService. + * the ObjectName of this MembershipService. */ private ObjectName oname = null; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
