You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2020/04/13 20:16:18 UTC

[logging-log4j2] branch release-2.x updated (76f4b0b -> 9af4523)

This is an automated email from the ASF dual-hosted git repository.

mattsicker pushed a change to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git.


    from 76f4b0b  LOG4J2-2520 - Allow servlet context path to be retrive with /
     new ab12770  Fix verifyHostName SSL option
     new 9af4523  Add docs for verifyHostName

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:
 .../java/org/apache/logging/log4j/core/net/ssl/SslConfiguration.java | 2 +-
 src/site/xdoc/manual/appenders.xml                                   | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)


[logging-log4j2] 02/02: Add docs for verifyHostName

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mattsicker pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git

commit 9af452377b1eb94aa1f2bb6f19e01a6e63326f20
Author: Matt Sicker <bo...@gmail.com>
AuthorDate: Mon Apr 13 15:16:10 2020 -0500

    Add docs for verifyHostName
    
    Signed-off-by: Matt Sicker <bo...@gmail.com>
---
 src/site/xdoc/manual/appenders.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/site/xdoc/manual/appenders.xml b/src/site/xdoc/manual/appenders.xml
index f2567d1..35bdff9 100644
--- a/src/site/xdoc/manual/appenders.xml
+++ b/src/site/xdoc/manual/appenders.xml
@@ -4990,6 +4990,11 @@ public class JpaLogEntity extends AbstractLogEventWrapperEntity {
               Determines whether the remote authentication credentials
               (and thus the connection) should be trusted.</td>
           </tr>
+            <tr>
+              <td>verifyHostName</td>
+              <td>boolean</td>
+              <td>Toggles whether or not to perform host name verification. Defaults to <code>false</code>.</td>
+            </tr>
           </table>
 
           <h4>KeyStore</h4>


[logging-log4j2] 01/02: Fix verifyHostName SSL option

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mattsicker pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git

commit ab1277088a447275e5bb8032af39ef0549be11ad
Author: Matt Sicker <bo...@gmail.com>
AuthorDate: Mon Apr 13 15:15:55 2020 -0500

    Fix verifyHostName SSL option
    
    This should be an attribute as there are no plugins corresponding to booleans.
    
    Signed-off-by: Matt Sicker <bo...@gmail.com>
---
 .../java/org/apache/logging/log4j/core/net/ssl/SslConfiguration.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/SslConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/SslConfiguration.java
index bc89fbe..ad03552 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/SslConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/SslConfiguration.java
@@ -251,7 +251,7 @@ public class SslConfiguration {
         @PluginAttribute("protocol") final String protocol,
         @PluginElement("KeyStore") final KeyStoreConfiguration keyStoreConfig,
         @PluginElement("TrustStore") final TrustStoreConfiguration trustStoreConfig,
-        @PluginElement("verifyHostName") final boolean verifyHostName) {
+        @PluginAttribute("verifyHostName") final boolean verifyHostName) {
         // @formatter:on
         return new SslConfiguration(protocol, keyStoreConfig, trustStoreConfig, verifyHostName);
     }