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 2010/02/22 22:12:12 UTC
svn commit: r915066 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt
java/org/apache/catalina/ant/AbstractCatalinaTask.java
java/org/apache/catalina/ant/DeployTask.java webapps/docs/changelog.xml
Author: markt
Date: Mon Feb 22 21:12:11 2010
New Revision: 915066
URL: http://svn.apache.org/viewvc?rev=915066&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48726
Prevent OOME when uploading large WAR files with the deployer
Patch provided by 'adam'
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/DeployTask.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 22 21:12:11 2010
@@ -1,2 +1,2 @@
/tomcat:883362
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77
0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901
39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,903916,905020,905151,905722,905728,905735,907825,908721,910471
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77
0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901
39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,903916,905020,905151,905722,905728,905735,907825,908721,908759,910471
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=915066&r1=915065&r2=915066&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Feb 22 21:12:11 2010
@@ -200,13 +200,6 @@
+1: markt
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48726
- Prevent OOME when uploading large WAR files with the deployer
- Patch provided by 'adam'
- http://svn.apache.org/viewvc?rev=908759&view=rev
- +1: markt, kkolinko, jfclere
- -1:
-
* More memory leak prevent - ResourceBundle
http://svn.apache.org/viewvc?rev=909097&view=rev (original)
http://svn.apache.org/viewvc?rev=909525&view=rev (improvements)
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java?rev=915066&r1=915065&r2=915066&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java Mon Feb 22 21:12:11 2010
@@ -185,6 +185,8 @@
if (contentLength >= 0) {
hconn.setRequestProperty("Content-Length",
"" + contentLength);
+
+ hconn.setFixedLengthStreamingMode(contentLength);
}
} else {
hconn.setDoOutput(false);
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/DeployTask.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/DeployTask.java?rev=915066&r1=915065&r2=915066&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/DeployTask.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/DeployTask.java Mon Feb 22 21:12:11 2010
@@ -166,8 +166,17 @@
}
} else {
try {
- stream = new BufferedInputStream
- (new FileInputStream(war), 1024);
+ FileInputStream fsInput = new FileInputStream(war);
+ long size = fsInput.getChannel().size();
+
+ if (size > Integer.MAX_VALUE)
+ throw new UnsupportedOperationException(
+ "DeployTask does not support WAR files " +
+ "greater than 2 Gb");
+ contentLength = (int) size;
+
+ stream = new BufferedInputStream(fsInput, 1024);
+
} catch (IOException e) {
throw new BuildException(e);
}
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=915066&r1=915065&r2=915066&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Feb 22 21:12:11 2010
@@ -74,6 +74,10 @@
<code>false</code> and <code>http</code> if the X-Forwarded-Proto header
has the value http. Patch provided by Cyrille Le Clerc. (markt)
</fix>
+ <fix>
+ <bug>48726</bug>: Prevent OOME when uploading large WAR files with the
+ deployer. Patch provided by adam. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org