Author: markt
Date: Thu Nov 25 17:17:59 2010
New Revision: 1039101
URL: http://svn.apache.org/viewvc?rev=1039101&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49860
Add support for trailing headers in chunked HTTP requests. The header length is
limited to 8192 by default and the limit can be changed via a system property.
markt/kkolinko
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 25 17:17:59 2010
@@ -1 +1 @@
-/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,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,944409,944416,945231,945808,945835,945841,946686
,948057,950164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,962865,962872,962881,962900,963865,963868,964614,966177-966178,966292,966692,981815,988448,991837,993042,1001955,1002185,1002263,1002274,1002349,1002359,1002362,1002481,1002514,1003461,1003481,1003488,1003556,1003572,1003581,1003861,1004868-1004869,1005452,1005467,1005647,1005802,1022120,1022134,1022323,1022415,1022606,1022623,1024224,1024251,1026042,1026784,1026912,1026920,1029767,1033415,1033842,1037924
+/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,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,944409,944416,945231,945808,945835,945841,946686
,948057,950164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,962865,962872,962881,962900,963865,963868,964614,966177-966178,966292,966692,981815,988448,991837,993042,1001955,1002185,1002263,1002274,1002349,1002359,1002362,1002481,1002514,1003461,1003481,1003488,1003556,1003572,1003581,1003861,1004868-1004869,1005452,1005467,1005647,1005802,1022120,1022134,1022323,1022415,1022606,1022623,1024224,1024251,1026042,1026784,1026912,1026920,1029767,1033415,1033448,1033842,1037924
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1039101&r1=1039100&r2=1039101&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Nov 25 17:17:59 2010
@@ -124,14 +124,6 @@ PATCHES PROPOSED TO BACKPORT:
kkolinko: Discussed in Re:r1005192 thread on dev@
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50222
- Pin the system rather than the common class loader in memory which will
- work better in an embedded environment.
- Patch provided by Christopher Schultz.
- http://svn.apache.org/viewvc?rev=1033448&view=rev
- +1: kkolinko, markt, jfclere
- -1:
-
* Backport Windows installer improvements from Tomcat 7.0.5.
- Add default --PidFile (new with daemon 1.0.3) (r982157, mturk)
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java?rev=1039101&r1=1039100&r2=1039101&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
Thu Nov 25 17:17:59 2010
@@ -150,162 +150,188 @@ public class JreMemoryLeakPreventionList
public void lifecycleEvent(LifecycleEvent event) {
// Initialise these classes when Tomcat starts
if (Lifecycle.INIT_EVENT.equals(event.getType())) {
- /*
- * Several components end up calling:
- * sun.awt.AppContext.getAppContext()
- *
- * Those libraries / components known to trigger memory leaks due
to
- * eventual calls to getAppContext() are:
- * - Google Web Toolkit via its use of javax.imageio
- * - Tomcat via its use of java.beans.Introspector.flushCaches() in
- * 1.6.0_15 onwards
- * - others TBD
- */
-
- // Trigger a call to sun.awt.AppContext.getAppContext(). This will
- // pin the common class loader in memory but that shouldn't be an
- // issue.
- if (appContextProtection) {
- ImageIO.getCacheDirectory();
- }
-
- /*
- * Several components end up calling:
- * sun.misc.GC.requestLatency(long)
- *
- * Those libraries / components known to trigger memory leaks due
to
- * eventual calls to requestLatency(long) are:
- * - javax.management.remote.rmi.RMIConnectorServer.start()
- */
- if (gcDaemonProtection) {
- try {
- Class<?> clazz = Class.forName("sun.misc.GC");
- Method method = clazz.getDeclaredMethod("requestLatency",
- new Class[] {long.class});
- method.invoke(null, Long.valueOf(3600000));
- } catch (ClassNotFoundException e) {
- if (System.getProperty("java.vendor").startsWith("Sun")) {
- log.error(sm.getString(
- "jreLeakListener.gcDaemonFail"), e);
- } else {
- log.debug(sm.getString(
- "jreLeakListener.gcDaemonFail"), e);
+
+ ClassLoader loader =
Thread.currentThread().getContextClassLoader();
+
+ try
+ {
+ // Use the system classloader as the victim for all this
+ // ClassLoader pinning we're about to do.
+ Thread.currentThread().setContextClassLoader(
+ ClassLoader.getSystemClassLoader());
+
+ /*
+ * Several components end up calling:
+ * sun.awt.AppContext.getAppContext()
+ *
+ * Those libraries / components known to trigger memory leaks
+ * due to eventual calls to getAppContext() are:
+ * - Google Web Toolkit via its use of javax.imageio
+ * - Tomcat via its use of
java.beans.Introspector.flushCaches()
+ * in 1.6.0_15 onwards
+ * - others TBD
+ */
+
+ // Trigger a call to sun.awt.AppContext.getAppContext(). This
+ // will pin the system class loader in memory but that
shouldn't
+ // be an issue.
+ if (appContextProtection) {
+ ImageIO.getCacheDirectory();
+ }
+
+ /*
+ * Several components end up calling:
+ * sun.misc.GC.requestLatency(long)
+ *
+ * Those libraries / components known to trigger memory leaks
+ * due to eventual calls to requestLatency(long) are:
+ * - javax.management.remote.rmi.RMIConnectorServer.start()
+ */
+ if (gcDaemonProtection) {
+ try {
+ Class<?> clazz = Class.forName("sun.misc.GC");
+ Method method = clazz.getDeclaredMethod(
+ "requestLatency",
+ new Class[] {long.class});
+ method.invoke(null, Long.valueOf(3600000));
+ } catch (ClassNotFoundException e) {
+ if (System.getProperty("java.vendor").startsWith(
+ "Sun")) {
+ log.error(sm.getString(
+ "jreLeakListener.gcDaemonFail"), e);
+ } else {
+ log.debug(sm.getString(
+ "jreLeakListener.gcDaemonFail"), e);
+ }
+ } catch (SecurityException e) {
+ log.error(sm.getString("jreLeakListener.gcDaemonFail"),
+ e);
+ } catch (NoSuchMethodException e) {
+ log.error(sm.getString("jreLeakListener.gcDaemonFail"),
+ e);
+ } catch (IllegalArgumentException e) {
+ log.error(sm.getString("jreLeakListener.gcDaemonFail"),
+ e);
+ } catch (IllegalAccessException e) {
+ log.error(sm.getString("jreLeakListener.gcDaemonFail"),
+ e);
+ } catch (InvocationTargetException e) {
+ log.error(sm.getString("jreLeakListener.gcDaemonFail"),
+ e);
}
- } catch (SecurityException e) {
- log.error(sm.getString("jreLeakListener.gcDaemonFail"), e);
- } catch (NoSuchMethodException e) {
- log.error(sm.getString("jreLeakListener.gcDaemonFail"), e);
- } catch (IllegalArgumentException e) {
- log.error(sm.getString("jreLeakListener.gcDaemonFail"), e);
- } catch (IllegalAccessException e) {
- log.error(sm.getString("jreLeakListener.gcDaemonFail"), e);
- } catch (InvocationTargetException e) {
- log.error(sm.getString("jreLeakListener.gcDaemonFail"), e);
}
- }
-
- /*
- * When a servlet opens a connection using a URL it will use
- * sun.net.www.http.HttpClient which keeps a static reference to a
- * keep-alive cache which is loaded using the web application class
- * loader.
- */
- if (keepAliveProtection) {
- try {
- Class.forName("sun.net.www.http.HttpClient");
- } catch (ClassNotFoundException e) {
- if (System.getProperty("java.vendor").startsWith("Sun")) {
- log.error(sm.getString(
- "jreLeakListener.keepAliveFail"), e);
- } else {
- log.debug(sm.getString(
- "jreLeakListener.keepAliveFail"), e);
+
+ /*
+ * When a servlet opens a connection using a URL it will use
+ * sun.net.www.http.HttpClient which keeps a static reference
to
+ * a keep-alive cache which is loaded using the web application
+ * class loader.
+ */
+ if (keepAliveProtection) {
+ try {
+ Class.forName("sun.net.www.http.HttpClient");
+ } catch (ClassNotFoundException e) {
+ if (System.getProperty("java.vendor").startsWith(
+ "Sun")) {
+ log.error(sm.getString(
+ "jreLeakListener.keepAliveFail"), e);
+ } else {
+ log.debug(sm.getString(
+ "jreLeakListener.keepAliveFail"), e);
+ }
}
}
- }
-
- /*
- * Calling getPolicy retains a static reference to the context
class
- * loader.
- */
- if (securityPolicyProtection) {
- try {
- // Policy.getPolicy();
- Class<?> policyClass = Class
- .forName("javax.security.auth.Policy");
- Method method = policyClass.getMethod("getPolicy");
- method.invoke(null);
- } catch(ClassNotFoundException e) {
- // Ignore. The class is deprecated.
- } catch(SecurityException e) {
- // Ignore. Don't need call to getPolicy() to be successful,
- // just need to trigger static initializer.
- } catch (NoSuchMethodException e) {
- log.warn(sm.getString("jreLeakListener.authPolicyFail"),
e);
- } catch (IllegalArgumentException e) {
- log.warn(sm.getString("jreLeakListener.authPolicyFail"),
e);
- } catch (IllegalAccessException e) {
- log.warn(sm.getString("jreLeakListener.authPolicyFail"),
e);
- } catch (InvocationTargetException e) {
- log.warn(sm.getString("jreLeakListener.authPolicyFail"),
e);
+
+ /*
+ * Calling getPolicy retains a static reference to the context
+ * class loader.
+ */
+ if (securityPolicyProtection) {
+ try {
+ // Policy.getPolicy();
+ Class<?> policyClass = Class
+ .forName("javax.security.auth.Policy");
+ Method method = policyClass.getMethod("getPolicy");
+ method.invoke(null);
+ } catch(ClassNotFoundException e) {
+ // Ignore. The class is deprecated.
+ } catch(SecurityException e) {
+ // Ignore. Don't need call to getPolicy() to be
+ // successful, just need to trigger static initializer.
+ } catch (NoSuchMethodException e) {
+
log.warn(sm.getString("jreLeakListener.authPolicyFail"),
+ e);
+ } catch (IllegalArgumentException e) {
+
log.warn(sm.getString("jreLeakListener.authPolicyFail"),
+ e);
+ } catch (IllegalAccessException e) {
+
log.warn(sm.getString("jreLeakListener.authPolicyFail"),
+ e);
+ } catch (InvocationTargetException e) {
+
log.warn(sm.getString("jreLeakListener.authPolicyFail"),
+ e);
+ }
}
- }
-
- /*
- * Creating a MessageDigest during web application startup
- * initializes the Java Cryptography Architecture. Under certain
- * conditions this starts a Token poller thread with TCCL equal
- * to the web application class loader.
- *
- * Instead we initialize JCA right now.
- */
- if (tokenPollerProtection) {
- java.security.Security.getProviders();
- }
-
- /*
- * Several components end up opening JarURLConnections without
first
- * disabling caching. This effectively locks the file. Whilst more
- * noticeable and harder to ignore on Windows, it affects all
- * operating systems.
- *
- * Those libraries/components known to trigger this issue include:
- * - log4j versions 1.2.15 and earlier
- * - javax.xml.bind.JAXBContext.newInstance()
- */
-
- // Set the default URL caching policy to not to cache
- if (urlCacheProtection) {
- try {
- // Doesn't matter that this JAR doesn't exist - just as
long as
- // the URL is well-formed
- URL url = new URL("jar:file://dummy.jar!/");
- URLConnection uConn = url.openConnection();
- uConn.setDefaultUseCaches(false);
- } catch (MalformedURLException e) {
- log.error(sm.getString(
- "jreLeakListener.jarUrlConnCacheFail"), e);
- } catch (IOException e) {
- log.error(sm.getString(
- "jreLeakListener.jarUrlConnCacheFail"), e);
+
+ /*
+ * Creating a MessageDigest during web application startup
+ * initializes the Java Cryptography Architecture. Under
certain
+ * conditions this starts a Token poller thread with TCCL equal
+ * to the web application class loader.
+ *
+ * Instead we initialize JCA right now.
+ */
+ if (tokenPollerProtection) {
+ java.security.Security.getProviders();
}
- }
-
- /*
- * Haven't got to the root of what is going on with this leak but
if
- * a web app is the first to make the calls below the web
- * application class loader will be pinned in memory.
- */
- if (xmlParsingProtection) {
- DocumentBuilderFactory factory =
- DocumentBuilderFactory.newInstance();
- try {
- factory.newDocumentBuilder();
- } catch (ParserConfigurationException e) {
- log.error(sm.getString("jreLeakListener.xmlParseFail"), e);
+
+ /*
+ * Several components end up opening JarURLConnections without
+ * first disabling caching. This effectively locks the file.
+ * Whilst more noticeable and harder to ignore on Windows, it
+ * affects all operating systems.
+ *
+ * Those libraries/components known to trigger this issue
+ * include:
+ * - log4j versions 1.2.15 and earlier
+ * - javax.xml.bind.JAXBContext.newInstance()
+ */
+
+ // Set the default URL caching policy to not to cache
+ if (urlCacheProtection) {
+ try {
+ // Doesn't matter that this JAR doesn't exist - just as
+ // long as the URL is well-formed
+ URL url = new URL("jar:file://dummy.jar!/");
+ URLConnection uConn = url.openConnection();
+ uConn.setDefaultUseCaches(false);
+ } catch (MalformedURLException e) {
+ log.error(sm.getString(
+ "jreLeakListener.jarUrlConnCacheFail"), e);
+ } catch (IOException e) {
+ log.error(sm.getString(
+ "jreLeakListener.jarUrlConnCacheFail"), e);
+ }
}
+
+ /*
+ * Haven't got to the root of what is going on with this leak
+ * but if a web app is the first to make the calls below the
web
+ * application class loader will be pinned in memory.
+ */
+ if (xmlParsingProtection) {
+ DocumentBuilderFactory factory =
+ DocumentBuilderFactory.newInstance();
+ try {
+ factory.newDocumentBuilder();
+ } catch (ParserConfigurationException e) {
+ log.error(sm.getString("jreLeakListener.xmlParseFail"),
+ e);
+ }
+ }
+ } finally {
+ Thread.currentThread().setContextClassLoader(loader);
}
}
}
-
}
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=1039101&r1=1039100&r2=1039101&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Nov 25 17:17:59 2010
@@ -163,6 +163,11 @@
Make sure Contexts defined in server.xml pick up any
<code>configClass</code>
setting from the parent Host. (markt)
</fix>
+ <add>
+ <bug>50222</bug>: Modify memory leak prevention code so it pins the
+ system class loader in memory rather than than the common class loader,
+ which is better for embedded systems. (schultz)
+ </add>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
