Merge tag '1.32.0' into branches/packaging1.32.0-1

Unit 1.32.0 release.

3 files changed, 4 insertions, 4 deletions

diff --git a/src/java/nginx/unit/websocket/DigestAuthenticator.java b/src/java/nginx/unit/websocket/DigestAuthenticator.java
index 9530c303..eb91a9b4 100644
--- a/src/java/nginx/unit/websocket/DigestAuthenticator.java
+++ b/src/java/nginx/unit/websocket/DigestAuthenticator.java
@@ -22,7 +22,7 @@ import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
 import java.util.Map;
 
-import org.apache.tomcat.util.security.MD5Encoder;
+import org.apache.tomcat.util.buf.HexUtils;
 
 /**
  * Authenticator supporting the DIGEST auth method.
@@ -140,7 +140,7 @@ public class DigestAuthenticator extends Authenticator {
         MessageDigest md = MessageDigest.getInstance("MD5");
         byte[] thedigest = md.digest(bytesOfMessage);
 
-        return MD5Encoder.encode(thedigest);
+        return HexUtils.toHexString(thedigest);
     }
 
     @Override
diff --git a/src/java/nginx/unit/websocket/Util.java b/src/java/nginx/unit/websocket/Util.java
index 6acf3ade..5388431f 100644
--- a/src/java/nginx/unit/websocket/Util.java
+++ b/src/java/nginx/unit/websocket/Util.java
@@ -332,7 +332,7 @@ public class Util {
 
     public static List<DecoderEntry> getDecoders(
             List<Class<? extends Decoder>> decoderClazzes)
-                    throws DeploymentException{
+                    throws DeploymentException {
 
         List<DecoderEntry> result = new ArrayList<>();
         if (decoderClazzes != null) {
diff --git a/src/java/nginx/unit/websocket/server/WsSessionListener.java b/src/java/nginx/unit/websocket/server/WsSessionListener.java
index fc2bc9c5..2921bd45 100644
--- a/src/java/nginx/unit/websocket/server/WsSessionListener.java
+++ b/src/java/nginx/unit/websocket/server/WsSessionListener.java
@@ -19,7 +19,7 @@ package nginx.unit.websocket.server;
 import javax.servlet.http.HttpSessionEvent;
 import javax.servlet.http.HttpSessionListener;
 
-public class WsSessionListener implements HttpSessionListener{
+public class WsSessionListener implements HttpSessionListener {
 
     private final WsServerContainer wsServerContainer;