Markus Koschany · Markus Koschany · Markus Koschany · Markus Koschany · 725efd8a · 725efd8a
--- a/.gitignore
+++ b/.gitignore
+.project
+build
+build.properties
--- a/debian/changelog
+++ b/debian/changelog
+libapache-mod-jk (1:1.2.46-1) unstable; urgency=medium
+
+  * New upstream version 1.2.46.
+  * Update debian/watch, import upstream signing key and verify tarballs.
+
+ -- Markus Koschany <apo@debian.org>  Sun, 14 Oct 2018 12:26:05 +0200
+
 libapache-mod-jk (1:1.2.44-3) unstable; urgency=medium

  * Remove conf/httpd-jk.conf from debian/clean to fix a FTBFS when building

--- a/debian/upstream/signing-key.asc
+++ b/debian/upstream/signing-key.asc
--- a/debian/watch
+++ b/debian/watch
-version=3
+version=4
+opts=pgpmode=auto \
 http://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-(.*)-src\.tar\.gz debian uupdate
--- a/docs/index.html
+++ b/docs/index.html
@@ -30,12 +30,12 @@ manual is described in more detail below.</p>

 </blockquote></td></tr></table><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td bgcolor="#525D76"><font color="#ffffff" face="arial,helvetica.sanserif"><a name="Headlines"><strong>Headlines</strong></a></font></td></tr><tr><td><blockquote>
 <ul>
-<li><a href="news/20180301.html#JK-1.2.43 released"><b>JK-1.2.43 released</b></a>
+<li><a href="news/20180301.html#JK-1.2.46 released"><b>JK-1.2.46 released</b></a>
 <p>The Apache Tomcat team is proud to announce the immediate availability
-   of Tomcat Connectors 1.2.43 Stable. This release contains improvements and
+   of Tomcat Connectors 1.2.46 Stable. This release contains improvements and
   bug fixes for issues found in previous releases.</p>
   
-<p>Download the <a href="//tomcat.apache.org/download-connectors.cgi">JK 1.2.43
+<p>Download the <a href="//tomcat.apache.org/download-connectors.cgi">JK 1.2.46
   release</a>.</p>
 </li>


--- a/docs/miscellaneous/changelog.html
+++ b/docs/miscellaneous/changelog.html
@@ -6,6 +6,51 @@
  It should contain fixes made only after November 10th 2004, when the
  new documentation project for JK was started.
  </p>
+</blockquote></td></tr></table><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td bgcolor="#525D76"><font color="#ffffff" face="arial,helvetica.sanserif"><a name="Changes between 1.2.45 and 1.2.46"><strong>Changes between 1.2.45 and 1.2.46</strong></a></font></td></tr><tr><td><blockquote>
+  <br>
+  <table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td bgcolor="#828DA6"><font color="#ffffff" face="arial,helvetica.sanserif"><a name="Native"><strong>Native</strong></a></font></td></tr><tr><td><blockquote>
+    <table border="0" cellpadding="2" cellspacing="2">
+      <tr><td valign="top"><img alt="fix" class="icon" src="../images/fix.gif"></td><td>
+        <a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=62751">62751</a>: Apache: Fix regression in 1.2.44 which resulted in
+        socket_connect_timeout to be interpreted in units of seconds
+        instead of milliseconds on platforms that provide poll(). (rjung)
+      </td></tr>
+    </table>
+  </blockquote></td></tr></table>
+</blockquote></td></tr></table><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td bgcolor="#525D76"><font color="#ffffff" face="arial,helvetica.sanserif"><a name="Changes between 1.2.44 and 1.2.45"><strong>Changes between 1.2.44 and 1.2.45</strong></a></font></td></tr><tr><td><blockquote>
+  <br>
+  <table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td bgcolor="#828DA6"><font color="#ffffff" face="arial,helvetica.sanserif"><a name="Native"><strong>Native</strong></a></font></td></tr><tr><td><blockquote>
+    <table border="0" cellpadding="2" cellspacing="2">
+      <tr><td valign="top"><img alt="fix" class="icon" src="../images/fix.gif"></td><td>
+        <a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=62689">62689</a>: Correct regression in 1.2.44 that broke request
+        handling for <b class="code">OPTIONS *</b> requests. (rjung)
+      </td></tr>
+      <tr><td valign="top"><img alt="update" class="icon" src="../images/update.gif"></td><td>
+        Apache: Update the documentation to note additional limitations of the
+        JkAutoAlias directive. (markt)
+      </td></tr>
+      <tr><td valign="top"><img alt="code" class="icon" src="../images/code.gif"></td><td>
+        Common: Optimize path parameter handling. (rjung)
+      </td></tr>
+      <tr><td valign="top"><img alt="fix" class="icon" src="../images/fix.gif"></td><td>
+        Improve path parameter parsing so that the session ID specified by the
+        <b class="code">session_path</b> worker property for load-balanced workers can
+        be extracted from a path parameter in any segment of the URI, rather
+        than only from the final segment. (markt)
+      </td></tr>
+      <tr><td valign="top"><img alt="fix" class="icon" src="../images/fix.gif"></td><td>
+        Apache: Improve path parameter handling so that
+        <b class="code">JkStripSession</b> can remove session IDs that are specified on
+        path parameters in any segment of the URI rather than only the final
+        segment. (markt)
+      </td></tr>
+      <tr><td valign="top"><img alt="fix" class="icon" src="../images/fix.gif"></td><td>
+        IIS: Improve path parameter handling so that <b class="code">strip_session</b>
+        can remove session IDs that are specified on path parameters in any
+        segment of the URI rather than only the final segment. (markt)
+      </td></tr>
+    </table>
+  </blockquote></td></tr></table>
 </blockquote></td></tr></table><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td bgcolor="#525D76"><font color="#ffffff" face="arial,helvetica.sanserif"><a name="Changes between 1.2.43 and 1.2.44"><strong>Changes between 1.2.43 and 1.2.44</strong></a></font></td></tr><tr><td><blockquote>
  <br>
  <table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td bgcolor="#828DA6"><font color="#ffffff" face="arial,helvetica.sanserif"><a name="Native"><strong>Native</strong></a></font></td></tr><tr><td><blockquote>

--- a/docs/miscellaneous/printer/changelog.html
+++ b/docs/miscellaneous/printer/changelog.html
@@ -5,6 +5,51 @@
  It should contain fixes made only after November 10th 2004, when the
  new documentation project for JK was started.
  </p>
+</blockquote></td></tr></table><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td bgcolor="#525D76"><font color="#ffffff" face="arial,helvetica.sanserif"><a name="Changes between 1.2.45 and 1.2.46"><strong>Changes between 1.2.45 and 1.2.46</strong></a></font></td></tr><tr><td><blockquote>
+  <br>
+  <table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td bgcolor="#828DA6"><font color="#ffffff" face="arial,helvetica.sanserif"><a name="Native"><strong>Native</strong></a></font></td></tr><tr><td><blockquote>
+    <table border="0" cellpadding="2" cellspacing="2">
+      <tr><td valign="top"><img alt="fix" class="icon" src="../../images/fix.gif"></td><td>
+        <a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=62751">62751</a>: Apache: Fix regression in 1.2.44 which resulted in
+        socket_connect_timeout to be interpreted in units of seconds
+        instead of milliseconds on platforms that provide poll(). (rjung)
+      </td></tr>
+    </table>
+  </blockquote></td></tr></table>
+</blockquote></td></tr></table><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td bgcolor="#525D76"><font color="#ffffff" face="arial,helvetica.sanserif"><a name="Changes between 1.2.44 and 1.2.45"><strong>Changes between 1.2.44 and 1.2.45</strong></a></font></td></tr><tr><td><blockquote>
+  <br>
+  <table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td bgcolor="#828DA6"><font color="#ffffff" face="arial,helvetica.sanserif"><a name="Native"><strong>Native</strong></a></font></td></tr><tr><td><blockquote>
+    <table border="0" cellpadding="2" cellspacing="2">
+      <tr><td valign="top"><img alt="fix" class="icon" src="../../images/fix.gif"></td><td>
+        <a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=62689">62689</a>: Correct regression in 1.2.44 that broke request
+        handling for <b class="code">OPTIONS *</b> requests. (rjung)
+      </td></tr>
+      <tr><td valign="top"><img alt="update" class="icon" src="../../images/update.gif"></td><td>
+        Apache: Update the documentation to note additional limitations of the
+        JkAutoAlias directive. (markt)
+      </td></tr>
+      <tr><td valign="top"><img alt="code" class="icon" src="../../images/code.gif"></td><td>
+        Common: Optimize path parameter handling. (rjung)
+      </td></tr>
+      <tr><td valign="top"><img alt="fix" class="icon" src="../../images/fix.gif"></td><td>
+        Improve path parameter parsing so that the session ID specified by the
+        <b class="code">session_path</b> worker property for load-balanced workers can
+        be extracted from a path parameter in any segment of the URI, rather
+        than only from the final segment. (markt)
+      </td></tr>
+      <tr><td valign="top"><img alt="fix" class="icon" src="../../images/fix.gif"></td><td>
+        Apache: Improve path parameter handling so that
+        <b class="code">JkStripSession</b> can remove session IDs that are specified on
+        path parameters in any segment of the URI rather than only the final
+        segment. (markt)
+      </td></tr>
+      <tr><td valign="top"><img alt="fix" class="icon" src="../../images/fix.gif"></td><td>
+        IIS: Improve path parameter handling so that <b class="code">strip_session</b>
+        can remove session IDs that are specified on path parameters in any
+        segment of the URI rather than only the final segment. (markt)
+      </td></tr>
+    </table>
+  </blockquote></td></tr></table>
 </blockquote></td></tr></table><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td bgcolor="#525D76"><font color="#ffffff" face="arial,helvetica.sanserif"><a name="Changes between 1.2.43 and 1.2.44"><strong>Changes between 1.2.43 and 1.2.44</strong></a></font></td></tr><tr><td><blockquote>
  <br>
  <table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td bgcolor="#828DA6"><font color="#ffffff" face="arial,helvetica.sanserif"><a name="Native"><strong>Native</strong></a></font></td></tr><tr><td><blockquote>

--- a/docs/news/20180301.html
+++ b/docs/news/20180301.html
 <html><head><META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>The Apache Tomcat Connectors - News - 2018 News &amp; Status</title><meta name="author" value="Apache Tomcat Connectors Project"><meta name="email" value="dev.AT.tomcat.DOT.apache.DOT.org"><link href="../style.css" type="text/css" rel="stylesheet"></head><body bgcolor="#ffffff" text="#000000" link="#525D76" alink="#525D76" vlink="#525D76"><table border="0" width="100%" cellspacing="4"><!--PAGE HEADER--><tr><td colspan="2"><!--TOMCAT LOGO--><a href="http://tomcat.apache.org/"><img src="../images/tomcat.gif" align="left" alt="Apache Tomcat" border="0"></a><!--APACHE LOGO--><a href="http://www.apache.org/"><img src="http://www.apache.org/images/asf-logo.gif" align="right" alt=" :: Apache Software Foundation" border="0"></a></td></tr><!--HEADER SEPARATOR--><tr><td colspan="2"><hr noshade size="1"></td></tr><tr><!--LEFT SIDE NAVIGATION--><td width="20%" valign="top" nowrap="true"><p><strong>Links</strong></p><ul><li><a href="../index.html">Docs Home</a></li></ul><p><strong>Common HowTo</strong></p><ul><li><a href="../common_howto/quick.html">For the impatient</a></li><li><a href="../common_howto/workers.html">All about workers</a></li><li><a href="../common_howto/timeouts.html">Timeouts</a></li><li><a href="../common_howto/loadbalancers.html">Load Balancing</a></li><li><a href="../common_howto/proxy.html">Reverse Proxy</a></li></ul><p><strong>Web Server HowTo</strong></p><ul><li><a href="../webserver_howto/apache.html">Apache HTTP Server (mod_jk)</a></li><li><a href="../webserver_howto/iis.html">Microsoft IIS (ISAPI redirector)</a></li><li><a href="../webserver_howto/nes.html">iPlanet Web Server (NSAPI redirector)</a></li></ul><p><strong>Reference Guide</strong></p><ul><li><a href="../reference/workers.html">workers.properties</a></li><li><a href="../reference/uriworkermap.html">uriworkermap.properties</a></li><li><a href="../reference/status.html">Status Worker</a></li><li><a href="../reference/apache.html">Apache HTTP Server (mod_jk)</a></li><li><a href="../reference/iis.html">Microsoft IIS (ISAPI redirector)</a></li></ul><p><strong>AJP Protocol Reference</strong></p><ul><li><a href="../ajp/ajpv13a.html">AJPv13 (ajp13)</a></li><li><a href="../ajp/ajpv13ext.html">AJPv13 Extension Proposal</a></li></ul><p><strong>Miscellaneous Documentation</strong></p><ul><li><a href="../miscellaneous/faq.html">Frequently asked questions</a></li><li><a href="../miscellaneous/changelog.html">Changelog</a></li><li><a href="http://issues.apache.org/bugzilla/buglist.cgi?query_format=advanced&amp;short_desc_type=allwordssubstr&amp;short_desc=&amp;product=Tomcat+Connectors&amp;long_desc_type=substring&amp;long_desc=&amp;bug_file_loc_type=allwordssubstr&amp;bug_file_loc=&amp;keywords_type=allwords&amp;keywords=&amp;bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED&amp;emailassigned_to1=1&amp;emailtype1=substring&amp;email1=&amp;emailassigned_to2=1&amp;emailreporter2=1&amp;emailcc2=1&amp;emailtype2=substring&amp;email2=&amp;bugidtype=include&amp;bug_id=&amp;votes=&amp;chfieldfrom=&amp;chfieldto=Now&amp;chfieldvalue=&amp;cmdtype=doit&amp;order=Reuse+same+sort+as+last+time&amp;field0-0-0=noop&amp;type0-0-0=noop&amp;value0-0-0=">Current Tomcat Connectors bugs</a></li><li><a href="../miscellaneous/doccontrib.html">Contribute documentation</a></li><li><a href="../miscellaneous/jkstatustasks.html">JK Status Ant Tasks</a></li><li><a href="../miscellaneous/reporttools.html">Reporting Tools</a></li><li><a href="http://tomcat.apache.org/connectors-doc-archive/jk2/index.html">Old JK/JK2 documentation</a></li></ul><p><strong>News</strong></p><ul><li><a href="../news/20180301.html">2018</a></li><li><a href="../news/20160901.html">2016</a></li><li><a href="../news/20150101.html">2015</a></li><li><a href="../news/20140201.html">2014</a></li><li><a href="../news/20120301.html">2012</a></li><li><a href="../news/20110701.html">2011</a></li><li><a href="../news/20100101.html">2010</a></li><li><a href="../news/20090301.html">2009</a></li><li><a href="../news/20081001.html">2008</a></li><li><a href="../news/20070301.html">2007</a></li><li><a href="../news/20060101.html">2006</a></li><li><a href="../news/20050101.html">2005</a></li><li><a href="../news/20041100.html">2004</a></li></ul></td><!--RIGHT SIDE MAIN BODY--><td width="80%" valign="top" align="left"><table border="0" width="100%" cellspacing="4"><tr><td align="left" valign="top"><h1>The Apache Tomcat Connectors - News</h1><h2>2018 News &amp; Status</h2></td><td align="right" valign="top" nowrap="true"><small><a href="printer/20180301.html"><img src="../images/printer.gif" border="0" alt="Printer Friendly Version"><br>print-friendly<br>version
                    </a></small></td></tr></table><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td bgcolor="#525D76"><font color="#ffffff" face="arial,helvetica.sanserif"><a name="2018 News &amp; Status"><strong>2018 News &amp; Status</strong></a></font></td></tr><tr><td><blockquote>
+
+<table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td bgcolor="#828DA6"><font color="#ffffff" face="arial,helvetica.sanserif"><a name="TBD September - JK-1.2.46 released"><strong>TBD September - JK-1.2.46 released</strong></a></font></td></tr><tr><td><blockquote>
+    <p>The Apache Tomcat team is proud to announce the immediate availability
+       of Tomcat Connectors 1.2.46. This is a maintenance release.</p>
+
+    <p>Please see the <a href="../miscellaneous/changelog.html">ChangeLog</a>
+       for a full list of changes.</p>
+
+    <p>If you find any bugs while using this release, please fill in the
+        <a href="https://bz.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%20Connectors">Bugzilla</a>
+        Bug Report.</p>
+</blockquote></td></tr></table>
+
+<table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td bgcolor="#828DA6"><font color="#ffffff" face="arial,helvetica.sanserif"><a name="1 September - JK-1.2.44 released"><strong>1 September - JK-1.2.44 released</strong></a></font></td></tr><tr><td><blockquote>
+    <p>The Apache Tomcat team is proud to announce the immediate availability
+       of Tomcat Connectors 1.2.44. This is a maintenance release.</p>
+
+    <p>Please see the <a href="../miscellaneous/changelog.html">ChangeLog</a>
+       for a full list of changes.</p>
+
+    <p>If you find any bugs while using this release, please fill in the
+        <a href="https://bz.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%20Connectors">Bugzilla</a>
+        Bug Report.</p>
+</blockquote></td></tr></table>
+
 <table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td bgcolor="#828DA6"><font color="#ffffff" face="arial,helvetica.sanserif"><a name="6 March - JK-1.2.43 released"><strong>6 March - JK-1.2.43 released</strong></a></font></td></tr><tr><td><blockquote>
    <p>The Apache Tomcat team is proud to announce the immediate availability
       of Tomcat Connectors 1.2.43. This is a maintenance release.</p>

--- a/docs/news/printer/20180301.html
+++ b/docs/news/printer/20180301.html
 <html><head><META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>The Apache Tomcat Connectors - News - 2018 News &amp; Status</title><meta name="author" value="Apache Tomcat Connectors Project"><meta name="email" value="dev.AT.tomcat.DOT.apache.DOT.org"><link href="../../style.css" type="text/css" rel="stylesheet"></head><body bgcolor="#ffffff" text="#000000" link="#525D76" alink="#525D76" vlink="#525D76"><table border="0" width="100%" cellspacing="4"><!--PAGE HEADER--><tr><td colspan="2"><!--TOMCAT LOGO--><a href="http://tomcat.apache.org/"><img src="../../images/tomcat.gif" align="left" alt="Apache Tomcat" border="0"></a><!--APACHE LOGO--><a href="http://www.apache.org/"><img src="http://www.apache.org/images/asf-logo.gif" align="right" alt=" :: Apache Software Foundation" border="0"></a></td></tr><!--HEADER SEPARATOR--><tr><td colspan="2"><hr noshade size="1"></td></tr><tr><!--RIGHT SIDE MAIN BODY--><td width="80%" valign="top" align="left"><table border="0" width="100%" cellspacing="4"><tr><td align="left" valign="top"><h1>The Apache Tomcat Connectors - News</h1><h2>2018 News &amp; Status</h2></td><td align="right" valign="top" nowrap="true"><img src="../../images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0" alt=" "></td></tr></table><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td bgcolor="#525D76"><font color="#ffffff" face="arial,helvetica.sanserif"><a name="2018 News &amp; Status"><strong>2018 News &amp; Status</strong></a></font></td></tr><tr><td><blockquote>
+
+<table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td bgcolor="#828DA6"><font color="#ffffff" face="arial,helvetica.sanserif"><a name="TBD September - JK-1.2.46 released"><strong>TBD September - JK-1.2.46 released</strong></a></font></td></tr><tr><td><blockquote>
+    <p>The Apache Tomcat team is proud to announce the immediate availability
+       of Tomcat Connectors 1.2.46. This is a maintenance release.</p>
+
+    <p>Please see the <a href="../../miscellaneous/changelog.html">ChangeLog</a>
+       for a full list of changes.</p>
+
+    <p>If you find any bugs while using this release, please fill in the
+        <a href="https://bz.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%20Connectors">Bugzilla</a>
+        Bug Report.</p>
+</blockquote></td></tr></table>
+
+<table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td bgcolor="#828DA6"><font color="#ffffff" face="arial,helvetica.sanserif"><a name="1 September - JK-1.2.44 released"><strong>1 September - JK-1.2.44 released</strong></a></font></td></tr><tr><td><blockquote>
+    <p>The Apache Tomcat team is proud to announce the immediate availability
+       of Tomcat Connectors 1.2.44. This is a maintenance release.</p>
+
+    <p>Please see the <a href="../../miscellaneous/changelog.html">ChangeLog</a>
+       for a full list of changes.</p>
+
+    <p>If you find any bugs while using this release, please fill in the
+        <a href="https://bz.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%20Connectors">Bugzilla</a>
+        Bug Report.</p>
+</blockquote></td></tr></table>
+
 <table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td bgcolor="#828DA6"><font color="#ffffff" face="arial,helvetica.sanserif"><a name="6 March - JK-1.2.43 released"><strong>6 March - JK-1.2.43 released</strong></a></font></td></tr><tr><td><blockquote>
    <p>The Apache Tomcat team is proud to announce the immediate availability
       of Tomcat Connectors 1.2.43. This is a maintenance release.</p>

--- a/docs/printer/index.html
+++ b/docs/printer/index.html
@@ -29,12 +29,12 @@ manual is described in more detail below.</p>

 </blockquote></td></tr></table><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td bgcolor="#525D76"><font color="#ffffff" face="arial,helvetica.sanserif"><a name="Headlines"><strong>Headlines</strong></a></font></td></tr><tr><td><blockquote>
 <ul>
-<li><a href="../news/20180301.html#JK-1.2.43 released"><b>JK-1.2.43 released</b></a>
+<li><a href="../news/20180301.html#JK-1.2.46 released"><b>JK-1.2.46 released</b></a>
 <p>The Apache Tomcat team is proud to announce the immediate availability
-   of Tomcat Connectors 1.2.43 Stable. This release contains improvements and
+   of Tomcat Connectors 1.2.46 Stable. This release contains improvements and
   bug fixes for issues found in previous releases.</p>
   
-<p>Download the <a href="//tomcat.apache.org/download-connectors.cgi">JK 1.2.43
+<p>Download the <a href="//tomcat.apache.org/download-connectors.cgi">JK 1.2.46
   release</a>.</p>
 </li>


--- a/docs/reference/apache.html
+++ b/docs/reference/apache.html
@@ -950,7 +950,13 @@ webapp directory. For security reasons it is strongly recommended that JkMount
 is used to pass all requests to Tomcat by default and JkUnMount is used to
 explicitly exclude static content to be served by Apache. It should also be noted
 that content served by Apache will bypass any security constraints defined in the
-application's web.xml.
+application's web.xml. The directive only works in the simple case of contexts
+with a single path element and no version marker. It does <b>not</b> support:
+<ul>
+<li>the ROOT context (i.e. .../webapps/ROOT)</li>
+<li>multi-level contexts (e.g. .../webapps/foo#bar)</li>
+<li>parallel deployment (e.g. .../webapps/foo##v00.05.12)</li>
+</ul>
 </p>
 <div class="example"><pre>
  # enter the full path to the tomcat webapps directory

--- a/docs/reference/printer/apache.html
+++ b/docs/reference/printer/apache.html
@@ -949,7 +949,13 @@ webapp directory. For security reasons it is strongly recommended that JkMount
 is used to pass all requests to Tomcat by default and JkUnMount is used to
 explicitly exclude static content to be served by Apache. It should also be noted
 that content served by Apache will bypass any security constraints defined in the
-application's web.xml.
+application's web.xml. The directive only works in the simple case of contexts
+with a single path element and no version marker. It does <b>not</b> support:
+<ul>
+<li>the ROOT context (i.e. .../webapps/ROOT)</li>
+<li>multi-level contexts (e.g. .../webapps/foo#bar)</li>
+<li>parallel deployment (e.g. .../webapps/foo##v00.05.12)</li>
+</ul>
 </p>
 <div class="example"><pre>
  # enter the full path to the tomcat webapps directory

--- a/jkstatus/.gitignore
+++ b/jkstatus/.gitignore
+build
+dist
--- a/jkstatus/build.properties.default
+++ b/jkstatus/build.properties.default
@@ -5,8 +5,6 @@
 # for your local environment.  It defines the location of all external
 # modules that Tomcat depends on.  Copy this file to "build.properties"
 # in the top-level source directory, and customize it as needed.
-#
-# $Id: build.properties.default 892628 2009-12-20 18:01:53Z markt $
 # -----------------------------------------------------------------------------

 # ----- Compile Control Flags -----

--- a/jkstatus/test/conf/log4j.xml
+++ b/jkstatus/test/conf/log4j.xml
@@ -21,10 +21,9 @@
 <!-- Log4j Configuration -->
 <!-- -->
 <!-- ===================================================================== -->
-<!-- $Id: log4j.xml 572120 2007-09-02 19:32:11Z markt $ -->
 <!--
-| For more configuration infromation and examples see the Jakarta Log4j
-| owebsite: http://jakarta.apache.org/log4j
+| For more configuration information and examples see the Jakarta Log4j
+| website: http://jakarta.apache.org/log4j
 -->
 <log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">


--- a/native/.gitignore
+++ b/native/.gitignore
+Makefile.in
+aclocal.m4
+configure
+config.log
+Makefile
+config.cache
+libtool
+config.status
+build.properties
+config.nice
+autom4te.cache
--- a/native/README.txt
+++ b/native/README.txt
@@ -13,8 +13,6 @@
  See the License for the specific language governing permissions and
  limitations under the License.

-$Id: README.txt 1302146 2012-03-18 15:52:03Z rjung $
-
 README for tomcat-connectors (mod_jk)
 =====================================


--- a/native/STATUS.txt
+++ b/native/STATUS.txt
@@ -14,11 +14,13 @@
  limitations under the License.

 TOMCAT CONNECTORS (JK) STATUS:			-*-text-*-
-Last modified at [$Date: 2018-08-24 17:15:03 +0100 (Fri, 24 Aug 2018) $]
+Last modified at [$Date: 2018-09-26 21:56:51 +0100 (Wed, 26 Sep 2018) $]

 Release:

-    1.2.44  : release in progress
+    1.2.46  : release in progress
+    1.2.45  : not released
+    1.2.44  : released September 1, 2018
    1.2.43  : released March 6, 2018
    1.2.42  : released October 5, 2016
    1.2.41  : released August 11, 2015

--- a/native/TODO.txt
+++ b/native/TODO.txt
@@ -15,8 +15,6 @@

 TODO for tomcat-connectors

-$Id: TODO.txt 1202556 2011-11-16 07:07:10Z mturk $
-
 1) Optimize "distance"
 ======================


--- a/native/apache-2.0/.gitignore
+++ b/native/apache-2.0/.gitignore
+.libs
+Makefile
+Makefile.apxs
+*.a
+*.o
+*.lo
+*.la
+*.slo
+*.so
+Release
+Debug
+*.dsw
+*.ncb
+*.opt
+*.plg