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 bf5e555 Revert changes that broke compilation with source=1.6 new 45170f0 Align with 8.5.x. new 0ef94ce Align with 8.5.x The 2 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: .../tomcat/websocket/AsyncChannelGroupUtil.java | 2 +- .../websocket/AsyncChannelWrapperSecure.java | 27 ++++----- .../tomcat/websocket/BackgroundProcessManager.java | 2 +- java/org/apache/tomcat/websocket/Constants.java | 14 +++-- .../tomcat/websocket/FutureToSendHandler.java | 2 +- .../apache/tomcat/websocket/PerMessageDeflate.java | 2 +- .../apache/tomcat/websocket/Transformation.java | 9 +++ .../tomcat/websocket/TransformationFactory.java | 2 +- java/org/apache/tomcat/websocket/Util.java | 3 +- java/org/apache/tomcat/websocket/WsFrameBase.java | 70 +++++++++------------- .../org/apache/tomcat/websocket/WsFrameClient.java | 22 +++---- .../apache/tomcat/websocket/server/Constants.java | 7 ++- .../server/DefaultServerEndpointConfigurator.java | 6 +- .../websocket/server/LocalStrings.properties | 3 +- .../tomcat/websocket/server/UpgradeUtil.java | 12 +++- .../tomcat/websocket/server/UriTemplate.java | 3 +- .../apache/tomcat/websocket/server/WsFilter.java | 2 - .../tomcat/websocket/server/WsFrameServer.java | 5 +- .../websocket/server/WsHandshakeRequest.java | 4 +- .../server/WsRemoteEndpointImplServer.java | 4 +- java/org/apache/tomcat/websocket/server/WsSci.java | 6 +- .../tomcat/websocket/server/WsServerContainer.java | 26 +++----- .../tomcat/websocket/server/WsWriteTimeout.java | 5 +- 23 files changed, 110 insertions(+), 128 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org