From 61aaf515ac25adbd666b7ee34b382de3bd83fe7d Mon Sep 17 00:00:00 2001 From: yukon Date: Thu, 19 Oct 2017 15:01:00 +0800 Subject: [PATCH] [ROCKETMQ-28] Fix description of SslMode unmatched problem --- .../main/java/org/apache/rocketmq/remoting/common/SslMode.java | 2 +- .../org/apache/rocketmq/remoting/netty/NettySystemConfig.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/remoting/src/main/java/org/apache/rocketmq/remoting/common/SslMode.java b/remoting/src/main/java/org/apache/rocketmq/remoting/common/SslMode.java index 8801736b..cb1e85a2 100644 --- a/remoting/src/main/java/org/apache/rocketmq/remoting/common/SslMode.java +++ b/remoting/src/main/java/org/apache/rocketmq/remoting/common/SslMode.java @@ -20,7 +20,7 @@ package org.apache.rocketmq.remoting.common; /** * For server, three SSL modes are supported: disabled, permissive and enforcing. *
    - *
  1. disable: SSL is not supported; any incoming SSL handshake will be rejected, causing connection closed.
  2. + *
  3. disabled: SSL is not supported; any incoming SSL handshake will be rejected, causing connection closed.
  4. *
  5. permissive: SSL is optional, aka, server in this mode can serve client connections with or without SSL;
  6. *
  7. enforcing: SSL is required, aka, non SSL connection will be rejected.
  8. *
diff --git a/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettySystemConfig.java b/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettySystemConfig.java index 3300262c..b9c1f3fa 100644 --- a/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettySystemConfig.java +++ b/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettySystemConfig.java @@ -51,7 +51,7 @@ public class NettySystemConfig { /** * For server, three SSL modes are supported: disabled, permissive and enforcing. *
    - *
  1. disable: SSL is not supported; any incoming SSL handshake will be rejected, causing connection closed.
  2. + *
  3. disabled: SSL is not supported; any incoming SSL handshake will be rejected, causing connection closed.
  4. *
  5. permissive: SSL is optional, aka, server in this mode can serve client connections with or without SSL;
  6. *
  7. enforcing: SSL is required, aka, non SSL connection will be rejected.
  8. *
-- GitLab