Emmanuel Bourg · Emmanuel Bourg · Emmanuel Bourg · Emmanuel Bourg · Emmanuel Bourg · 0fe99bb4
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -2,6 +2,23 @@

   This is the Changelog for Tomcat Native 1.2.

+  Changes in 1.2.21
+
+     * Fix: Correct a possible JVM crash during shutdown caused by a bug in
+       the fix for the per connection memory leak included in 1.2.20. (rjung)
+
+  Changes in 1.2.20
+
+     * Fix: Update includedir name to tomcat-native instead of apr.
+       (csutherl)
+     * Fix: Fix a minor memory leak. It occurred every time a TLS connector
+       was started so the impact was very unlikely to be noticed. (markt)
+     * Fix: Fix some minor memory leaks that could occur after error
+       conditions during TLS connector initialisation. (markt)
+     * Fix: Fix a per connection memory leak when using OpenSSL BIO. This is
+       typically used when OpenSSL is providing the TLS support for NIO or
+       NIO2. (markt)
+
  Changes in 1.2.19

     * Fix: 62892: Fix memory leaks in OCSP handling. (jfclere)
@@ -220,4 +237,4 @@

   Please see the 1.1.x changelog.

-   Copyright © 2008-2018, The Apache Software Foundation
+   Copyright © 2008-2019, The Apache Software Foundation
--- a/NOTICE
+++ b/NOTICE
 Apache Tomcat Native Library
-Copyright 2002-2018 The Apache Software Foundation
+Copyright 2002-2019 The Apache Software Foundation

 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

--- a/build.properties.default
+++ b/build.properties.default
@@ -18,7 +18,7 @@
 # ----- Version Control Flags -----
 version.major=1
 version.minor=2
-version.build=19
+version.build=21
 version.patch=0
 version.suffix=


--- a/build.xml
+++ b/build.xml
@@ -30,7 +30,7 @@
    <property name="project"               value="tomcat-native" />
    <property name="name"                  value="Tomcat Native" />
    <property name="title"                 value="Tomcat Native Library"/>
-    <property name="year"                  value="2018" />
+    <property name="year"                  value="2019" />

    <property name="test.runner"           value="junit.textui.TestRunner"/>

@@ -174,7 +174,7 @@
            packagenames="org.apache.tomcat.*"
            windowtitle="${title} (Version ${version})"
            doctitle="&lt;h1&gt;${title} (Version ${version})&lt;/h1&gt;"
-            bottom="Copyright 2002-2018 The Apache Software Foundation.&lt;!--
+            bottom="Copyright 2002-2019 The Apache Software Foundation.&lt;!--

 Licensed under the Apache License, Version 2.0 (the 'License');
 you may not use this file except in compliance with the License.

--- a/debian/changelog
+++ b/debian/changelog
+tomcat-native (1.2.21-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream release
+  * Standards-Version updated to 4.3.0
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Thu, 31 Jan 2019 22:11:32 +0100
+
 tomcat-native (1.2.19-1) unstable; urgency=medium

  * Team upload.

--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends:
 dpkg-dev (>= 1.16.1~),
 libapr1-dev,
 libssl-dev
-Standards-Version: 4.2.1
+Standards-Version: 4.3.0
 Vcs-Git: https://salsa.debian.org/java-team/tomcat-native.git
 Vcs-Browser: https://salsa.debian.org/java-team/tomcat-native
 Homepage: http://tomcat.apache.org/native-doc/

--- a/debian/rules
+++ b/debian/rules
@@ -10,11 +10,8 @@ override_dh_auto_configure:
 override_dh_auto_install:
 	dh_auto_install
 	rmdir debian/libtcnative-1/usr/bin
-	rmdir debian/libtcnative-1/usr/include
+	rm -Rf debian/libtcnative-1/usr/include
 	find $(DEB_DESTDIR) -name "*.la" -exec rm -vf {} \;

 # No check target
 override_dh_auto_test:
-
-get-orig-source:
-	uscan --force-download --rename
--- a/docs/index.html
+++ b/docs/index.html
@@ -27,10 +27,10 @@
 </div><h3 id="Headlines">Headlines</h3><div class="text">
 <ul>

-<li><a href="news/2018.html#20181020">10 Oct 2018 - <b>TC-Native-1.2.18
+<li><a href="news/2018.html#20181204">4 Dec 2018 - <b>TC-Native-1.2.19
 released</b></a>
 <p>The Apache Tomcat team is proud to announce the immediate availability of
-Tomcat Native 1.2.18 Stable.</p>
+Tomcat Native 1.2.19 Stable.</p>
 <p>
 The sources and the binaries for selected platforms are available from the
 <a href="../download-native.cgi">Download page</a>.
@@ -154,8 +154,8 @@ INFO: Initializing Coyote HTTP/1.1 on http-8080</code></pre></div>

  <p>
    Refer to the tomcat documentation to configure the connectors
-    (See <a href="http://tomcat.apache.org/tomcat-8.5-doc/apr.html">Tomcat 8.5.x</a>,
-    <a href="http://tomcat.apache.org/tomcat-8.0-doc/apr.html">Tomcat 8.0.x</a>
+    (See <a href="http://tomcat.apache.org/tomcat-9.0-doc/apr.html">Tomcat 9.0.x</a>
+    <a href="http://tomcat.apache.org/tomcat-8.5-doc/apr.html">Tomcat 8.5.x</a>
    and <a href="http://tomcat.apache.org/tomcat-7.0-doc/apr.html">Tomcat 7.0.x</a>)
  </p>
 </div></div>
@@ -180,5 +180,5 @@ INFO: Initializing Coyote HTTP/1.1 on http-8080</code></pre></div>
 </div></div>

 </div></div></div></div></div><footer><div id="footer">
-    Copyright &copy; 2008-2018, The Apache Software Foundation
+    Copyright &copy; 2008-2019, The Apache Software Foundation
  </div></footer></div></body></html>
\ No newline at end of file
--- a/docs/miscellaneous/changelog.html
+++ b/docs/miscellaneous/changelog.html
@@ -3,6 +3,31 @@
  <p>
  This is the Changelog for Tomcat Native 1.2.
  </p>
+</div><h3 id="Changes_in_1.2.21">Changes in 1.2.21</h3><div class="text">
+  <ul class="changelog">
+    <li><img alt="Fix: " class="icon" src="../images/fix.gif">
+      Correct a possible JVM crash during shutdown caused by a bug in the fix
+      for the per connection memory leak included in 1.2.20. (rjung)
+    </li>
+  </ul>
+</div><h3 id="Changes_in_1.2.20">Changes in 1.2.20</h3><div class="text">
+  <ul class="changelog">
+    <li><img alt="Fix: " class="icon" src="../images/fix.gif">
+      Update includedir name to tomcat-native instead of apr. (csutherl)
+    </li>
+    <li><img alt="Fix: " class="icon" src="../images/fix.gif">
+      Fix a minor memory leak. It occurred every time a TLS connector was
+      started so the impact was very unlikely to be noticed. (markt)
+    </li>
+    <li><img alt="Fix: " class="icon" src="../images/fix.gif">
+      Fix some minor memory leaks that could occur after error conditions during
+      TLS connector initialisation. (markt)
+    </li>
+    <li><img alt="Fix: " class="icon" src="../images/fix.gif">
+      Fix a per connection memory leak when using OpenSSL BIO. This is typically
+      used when OpenSSL is providing the TLS support for NIO or NIO2. (markt)
+    </li>
+  </ul>
 </div><h3 id="Changes_in_1.2.19">Changes in 1.2.19</h3><div class="text">
  <ul class="changelog">
    <li><img alt="Fix: " class="icon" src="../images/fix.gif">
@@ -380,5 +405,5 @@
 <p>Please see the <a href="../../native-1.1-doc/miscellaneous/changelog.html">1.1.x
   changelog</a>.</p>
 </div></div></div></div></div><footer><div id="footer">
-    Copyright &copy; 2008-2018, The Apache Software Foundation
+    Copyright &copy; 2008-2019, The Apache Software Foundation
  </div></footer></div></body></html>
\ No newline at end of file
--- a/docs/news/2008.html
+++ b/docs/news/2008.html
@@ -24,5 +24,5 @@ and some bug fixes.
 </p>
 </div></div>
 </div></div></div></div></div><footer><div id="footer">
-    Copyright &copy; 2008-2018, The Apache Software Foundation
+    Copyright &copy; 2008-2019, The Apache Software Foundation
  </div></footer></div></body></html>
\ No newline at end of file
--- a/docs/news/2009.html
+++ b/docs/news/2009.html
@@ -8,5 +8,5 @@ of Tomcat Native 1.1.18. This is a stable release adding some bug fixes.
 </p>
 </div></div>
 </div></div></div></div></div><footer><div id="footer">
-    Copyright &copy; 2008-2018, The Apache Software Foundation
+    Copyright &copy; 2008-2019, The Apache Software Foundation
  </div></footer></div></body></html>
\ No newline at end of file
--- a/docs/news/2010.html
+++ b/docs/news/2010.html
@@ -13,5 +13,5 @@ of Tomcat Native 1.1.19. This is a stable release adding some bug fixes.
 </p>
 </div></div>
 </div></div></div></div></div><footer><div id="footer">
-    Copyright &copy; 2008-2018, The Apache Software Foundation
+    Copyright &copy; 2008-2019, The Apache Software Foundation
  </div></footer></div></body></html>
\ No newline at end of file
--- a/docs/news/2011.html
+++ b/docs/news/2011.html
@@ -9,5 +9,5 @@ of Tomcat Native 1.1.22. This is a stable release adding some bug fixes.
 </p>
 </div></div>
 </div></div></div></div></div><footer><div id="footer">
-    Copyright &copy; 2008-2018, The Apache Software Foundation
+    Copyright &copy; 2008-2019, The Apache Software Foundation
  </div></footer></div></body></html>
\ No newline at end of file
--- a/docs/news/2012.html
+++ b/docs/news/2012.html
@@ -19,5 +19,5 @@ experimental support for OCSP and PKCS12 certificates.
 </p>
 </div></div>
 </div></div></div></div></div><footer><div id="footer">
-    Copyright &copy; 2008-2018, The Apache Software Foundation
+    Copyright &copy; 2008-2019, The Apache Software Foundation
  </div></footer></div></body></html>
\ No newline at end of file
--- a/docs/news/2013.html
+++ b/docs/news/2013.html
@@ -22,5 +22,5 @@ of Tomcat Native 1.1.27. This is a bug fixing release.
 </p>
 </div></div>
 </div></div></div></div></div><footer><div id="footer">
-    Copyright &copy; 2008-2018, The Apache Software Foundation
+    Copyright &copy; 2008-2019, The Apache Software Foundation
  </div></footer></div></body></html>
\ No newline at end of file
--- a/docs/news/2014.html
+++ b/docs/news/2014.html
@@ -19,5 +19,5 @@
  </p>
 </div></div>
 </div></div></div></div></div><footer><div id="footer">
-    Copyright &copy; 2008-2018, The Apache Software Foundation
+    Copyright &copy; 2008-2019, The Apache Software Foundation
  </div></footer></div></body></html>
\ No newline at end of file
--- a/docs/news/2015.html
+++ b/docs/news/2015.html
@@ -26,5 +26,5 @@
  </p>
 </div></div>    
 </div></div></div></div></div><footer><div id="footer">
-    Copyright &copy; 2008-2018, The Apache Software Foundation
+    Copyright &copy; 2008-2019, The Apache Software Foundation
  </div></footer></div></body></html>
\ No newline at end of file
--- a/docs/news/2016.html
+++ b/docs/news/2016.html
@@ -39,5 +39,5 @@
  </p>
 </div></div>
 </div></div></div></div></div><footer><div id="footer">
-    Copyright &copy; 2008-2018, The Apache Software Foundation
+    Copyright &copy; 2008-2019, The Apache Software Foundation
  </div></footer></div></body></html>
\ No newline at end of file
--- a/docs/news/2017.html
+++ b/docs/news/2017.html
@@ -22,5 +22,5 @@
  </p>
 </div></div>
 </div></div></div></div></div><footer><div id="footer">
-    Copyright &copy; 2008-2018, The Apache Software Foundation
+    Copyright &copy; 2008-2019, The Apache Software Foundation
  </div></footer></div></body></html>
\ No newline at end of file
--- a/docs/news/2018.html
+++ b/docs/news/2018.html
 <!DOCTYPE html SYSTEM "about:legacy-compat">
 <html lang="en"><head><META http-equiv="Content-Type" content="text/html; charset=UTF-8"><link href="../images/docs-stylesheet.css" rel="stylesheet" type="text/css"><link href="../images/style.css" rel="stylesheet" type="text/css"><title>The Apache Tomcat Native - News - 2018 News and Status</title></head><body><div id="wrapper"><header><div id="header"><div><div><div class="logo noPrint"><a href="http://tomcat.apache.org/"><img alt="Tomcat Home" src="../images/tomcat.png"></a></div><div style="height: 1px;"></div><div class="asfLogo noPrint"><a href="http://www.apache.org/" target="_blank"><img src="../images/asf-feather.png" alt="The Apache Software Foundation" style="width: 266px; height: 83px;"></a></div><h1>The Apache Tomcat Native - News</h1><div style="height: 1px;"></div><div style="clear: left;"></div></div></div></div></header><div id="middle"><div><div id="mainLeft" class="noprint"><div><nav><div><h2><strong>Links</strong></h2><ul><li><a href="../index.html">Docs Home</a></li></ul></div><div><h2><strong>Miscellaneous Documentation</strong></h2><ul><li><a href="../miscellaneous/changelog.html">Changelog</a></li></ul></div><div><h2><strong>News</strong></h2><ul><li><a href="../news/2017.html">2017</a></li><li><a href="../news/2016.html">2016</a></li><li><a href="../news/2015.html">2015</a></li><li><a href="../news/2014.html">2014</a></li><li><a href="../news/2013.html">2013</a></li><li><a href="../news/2012.html">2012</a></li><li><a href="../news/2011.html">2011</a></li><li><a href="../news/2010.html">2010</a></li><li><a href="../news/2009.html">2009</a></li><li><a href="../news/2008.html">2008</a></li></ul></div></nav></div></div><div id="mainRight"><div id="content"><h2>2018 News and Status</h2><h3 id="2018_News_&amp;_Status">2018 News &amp; Status</h3><div class="text">
+ <div class="subsection"><h4 id="20181204">4 Dec 2018 - TC-Native-1.2.19 released</h4><div class="text">
+  <p>The Apache Tomcat team is proud to announce the immediate availability of
+  Tomcat Native 1.2.19. This is a bugfix release that also updates the
+  dependencies for the Windows binaries and includes Windows binaries built
+  with OpenSSL 1.0.2q/APR 1.6.5 and 1.1.1a/APR 1.6.5.
+  </p>
+ </div></div>
 <div class="subsection"><h4 id="20181020">20 Oct 2018 - TC-Native-1.2.18 released</h4><div class="text">
  <p>The Apache Tomcat team is proud to announce the immediate availability of
-  Tomcat Native 1.2.18. This is a festure and bugfix release that adds TLSv1.3
+  Tomcat Native 1.2.18. This is a feature and bugfix release that adds TLSv1.3
  support when built with OpenSSL 1.1.1. It also includes Windows binaries built
  with OpenSSL 1.0.2p/APR 1.6.5 and 1.1.1/APR 1.6.5.
  </p>
@@ -15,5 +22,5 @@
  </p>
 </div></div>
 </div></div></div></div></div><footer><div id="footer">
-    Copyright &copy; 2008-2018, The Apache Software Foundation
+    Copyright &copy; 2008-2019, The Apache Software Foundation
  </div></footer></div></body></html>
\ No newline at end of file