Author: markt
Date: Thu Jan 10 13:32:43 2008
New Revision: 610938
URL: http://svn.apache.org/viewvc?rev=610938&view=rev
Log:
Fix bug 43775. Don't change line endings for binary files
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/dist.xml
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=610938&r1=610937&r2=610938&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jan 10 13:32:43 2008
@@ -31,12 +31,6 @@
+1: jfclere
-1: fhanik - Can we add the 'package' directive to make the package match
the dir structure
- Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43775
- Don't change line endings for binary files
- http://svn.apache.org/viewvc?rev=607888&view=rev
- +1: markt, funkman, fhanik, pero
- -1:
-
Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43758
Prevent NPEs when scripting elements are empty
http://svn.apache.org/viewvc?rev=607903&view=rev
Modified: tomcat/tc6.0.x/trunk/dist.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/dist.xml?rev=610938&r1=610937&r2=610938&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/dist.xml (original)
+++ tomcat/tc6.0.x/trunk/dist.xml Thu Jan 10 13:32:43 2008
@@ -711,7 +711,8 @@
<!-- Packages the source code distribution in tar.gz format -->
<target name="package-src-tgz">
<fixcrlf srcdir="${tomcat.dist}/src"
- excludes="**/*.jar,**/*.gif,**/*.bmp,**/*.jpg,**/*.ico,**/*.war"
eol="lf"/>
+
excludes="**/*.jar,**/*.gif,**/*.bmp,**/*.jpg,**/*.ico,**/*.war,**/*.exe.**/*.pdf,**/*.bin,**/*.dia"
+ eol="lf"/>
<tar longfile="gnu" compression="gzip"
tarfile="${tomcat.release}/v${version}/src/${final-src.name}.tar.gz">
<tarfileset dir="${tomcat.dist}/src" prefix="${final-src.name}" />
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=610938&r1=610937&r2=610938&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Jan 10 13:32:43 2008
@@ -46,6 +46,10 @@
to the one in CATALINA_HOME. Patch provided by Shaddy Baddah.
(markt/jim)
</fix>
+ <fix>
+ <bug>43775</bug>: Don't try to change line endings of binary files in
+ the source distribution. (markt)
+ </fix>
<fix><bug>43846</bug>:
Fix block simulated read and writes causing timeouts.
Add non blocking parsing of HTTP request headers.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
