You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2021/03/26 09:50:24 UTC

[tomcat-native] branch master updated (2bfb564 -> e913c10)

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-native.git.


    from 2bfb564  Update recommended OpenSSL version to 1.1.1k or later
     new 825fc23  Update java code to align with 10.0.x
     new e913c10  Estimate 1.2.27 release date as 29 Mar 2021

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/tomcat/jni/SSLContext.java |  9 +++++++--
 xdocs/index.xml                            |  4 ++--
 xdocs/miscellaneous/project.xml            |  1 +
 xdocs/news/{2019.xml => 2021.xml}          | 15 +++++----------
 xdocs/news/project.xml                     |  1 +
 xdocs/project.xml                          |  1 +
 6 files changed, 17 insertions(+), 14 deletions(-)
 copy xdocs/news/{2019.xml => 2021.xml} (69%)

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


[tomcat-native] 01/02: Update java code to align with 10.0.x

Posted by ma...@apache.org.
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-native.git

commit 825fc23733a82c28f005c365caa7e724fa437b5a
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Mar 26 09:44:32 2021 +0000

    Update java code to align with 10.0.x
---
 java/org/apache/tomcat/jni/SSLContext.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/tomcat/jni/SSLContext.java b/java/org/apache/tomcat/jni/SSLContext.java
index e0759b3..1810571 100644
--- a/java/org/apache/tomcat/jni/SSLContext.java
+++ b/java/org/apache/tomcat/jni/SSLContext.java
@@ -17,6 +17,7 @@
 
 package org.apache.tomcat.jni;
 
+import java.util.Locale;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -416,7 +417,10 @@ public final class SSLContext {
         if (sniCallBack == null) {
             return 0;
         }
-        return sniCallBack.getSslContext(sniHostName);
+        // Can't be sure OpenSSL is going to provide the SNI value in lower case
+        // so convert it before looking up the SSLContext
+        String hostName = (sniHostName == null) ? null : sniHostName.toLowerCase(Locale.ENGLISH);
+        return sniCallBack.getSslContext(hostName);
     }
 
     /**
@@ -470,7 +474,8 @@ public final class SSLContext {
          * This callback is made during the TLS handshake when the client uses
          * the SNI extension to request a specific TLS host.
          *
-         * @param sniHostName The host name requested by the client
+         * @param sniHostName The host name requested by the client - must be in
+         *                    lower case
          *
          * @return The Java representation of the pointer to the OpenSSL
          *         SSLContext to use for the given host or zero if no SSLContext

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


[tomcat-native] 02/02: Estimate 1.2.27 release date as 29 Mar 2021

Posted by ma...@apache.org.
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-native.git

commit e913c1000e3181049319fdf9bed1eb4f9f2188fa
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Mar 26 09:50:08 2021 +0000

    Estimate 1.2.27 release date as 29 Mar 2021
---
 xdocs/index.xml                 |  4 ++--
 xdocs/miscellaneous/project.xml |  1 +
 xdocs/news/2021.xml             | 39 +++++++++++++++++++++++++++++++++++++++
 xdocs/news/project.xml          |  1 +
 xdocs/project.xml               |  1 +
 5 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/xdocs/index.xml b/xdocs/index.xml
index f778e5c..11432cf 100644
--- a/xdocs/index.xml
+++ b/xdocs/index.xml
@@ -60,10 +60,10 @@
 <section name="Headlines">
 <ul>
 
-<li><a href="news/2020.html#20201221">21 Dec 2020 - <b>TC-Native-1.2.26
+<li><a href="news/2021.html#20210329">29 Mar 2021 - <b>TC-Native-1.2.27
 released</b></a>
 <p>The Apache Tomcat team is proud to announce the immediate availability of
-Tomcat Native 1.2.26 Stable.</p>
+Tomcat Native 1.2.27 Stable.</p>
 <p>
 The sources and the binaries for selected platforms are available from the
 <a href="../download-native.cgi">Download page</a>.
diff --git a/xdocs/miscellaneous/project.xml b/xdocs/miscellaneous/project.xml
index c73abc8..36e85fd 100644
--- a/xdocs/miscellaneous/project.xml
+++ b/xdocs/miscellaneous/project.xml
@@ -34,6 +34,7 @@
     </menu>
 
     <menu name="News">
+        <item name="2021"                       href="../news/2021.html"/>
         <item name="2020"                       href="../news/2020.html"/>
         <item name="2019"                       href="../news/2019.html"/>
         <item name="2018"                       href="../news/2018.html"/>
diff --git a/xdocs/news/2021.xml b/xdocs/news/2021.xml
new file mode 100644
index 0000000..e3afc7a
--- /dev/null
+++ b/xdocs/news/2021.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!DOCTYPE document [
+  <!ENTITY project SYSTEM "project.xml">
+]>
+<document url="2021.html">
+
+  &project;
+
+  <properties>
+    <title>2021 News and Status</title>
+  </properties>
+
+<body>
+
+<section name="2021 News &amp; Status">
+ <subsection anchor="20210329" name="29 Mar 2021 - TC-Native-1.2.27 released">
+  <p>The Apache Tomcat team is proud to announce the immediate availability of
+  Tomcat Native 1.2.27. This is a bugfix release.
+  </p>
+ </subsection>
+</section>
+</body>
+</document>
diff --git a/xdocs/news/project.xml b/xdocs/news/project.xml
index 5e76d93..939d6fb 100644
--- a/xdocs/news/project.xml
+++ b/xdocs/news/project.xml
@@ -34,6 +34,7 @@
     </menu>
 
     <menu name="News">
+      <item name="2021" href="../news/2021.html"/>
       <item name="2020" href="../news/2020.html"/>
       <item name="2019" href="../news/2019.html"/>
       <item name="2018" href="../news/2018.html"/>
diff --git a/xdocs/project.xml b/xdocs/project.xml
index 2eb025c..15d0932 100644
--- a/xdocs/project.xml
+++ b/xdocs/project.xml
@@ -34,6 +34,7 @@
     </menu>
 
     <menu name="News">
+      <item name="2021" href="news/2021.html"/>
       <item name="2020" href="news/2020.html"/>
       <item name="2019" href="news/2019.html"/>
       <item name="2018" href="news/2018.html"/>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org