Author: markt
Date: Mon Jul 24 11:44:38 2017
New Revision: 1802788

URL: http://svn.apache.org/viewvc?rev=1802788&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61316
Fix corruption of UTF-16 encoded source files in released source distributions.

Modified:
    tomcat/trunk/build.xml
    tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1802788&r1=1802787&r2=1802788&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Mon Jul 24 11:44:38 2017
@@ -284,6 +284,10 @@
     <include name="**/*.xml"/>
     <include name="**/*.xsd"/>
     <include name="**/*.xsl"/>
+    <!-- Exclude files that aren't encoding using ISO-8859-1    -->
+    <!-- This prevents fixcrlf corrupting them during a release -->
+    <exclude name="**/bom-none-prolog-utf16?e.jspx"/>
+    <exclude name="**/bom-utf16?e-prolog-*.jsp*"/>
   </patternset>
 
 

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1802788&r1=1802787&r2=1802788&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Jul 24 11:44:38 2017
@@ -77,6 +77,14 @@
       </fix>
     </changelog>
   </subsection>
+  <subsection name="Other">
+    <changelog>
+      <fix>
+        <bug>61316</bug>: Fix corruption of UTF-16 encoded source files in
+        released source distributions. (markt)
+      </fix>
+    </changelog>
+  </subsection>
 </section>
 <section name="Tomcat 9.0.0.M24 (markt)" rtext="release in progress">
   <subsection name="Catalina">



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

Reply via email to