JBossWeb SVN: r1734 - branches.
by jbossweb-commits@lists.jboss.org
Author: bmaxwell
Date: 2011-06-07 23:23:33 -0400 (Tue, 07 Jun 2011)
New Revision: 1734
Added:
branches/JBOSSWEB_2_0_0_GA_CP15_JBPAPP-6688/
Log:
[JBPAPP-6688] create one off patch branch
13 years, 6 months
JBossWeb SVN: r1733 - in trunk: webapps/docs and 1 other directory.
by jbossweb-commits@lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2011-06-07 11:23:58 -0400 (Tue, 07 Jun 2011)
New Revision: 1733
Modified:
trunk/java/org/apache/catalina/connector/OutputBuffer.java
trunk/webapps/docs/changelog.xml
Log:
- 51324: Recycle the doFlush flag, which could remain set if an error occurs, causing more flushes
for subsequent requests.
Modified: trunk/java/org/apache/catalina/connector/OutputBuffer.java
===================================================================
--- trunk/java/org/apache/catalina/connector/OutputBuffer.java 2011-06-06 12:10:58 UTC (rev 1732)
+++ trunk/java/org/apache/catalina/connector/OutputBuffer.java 2011-06-07 15:23:58 UTC (rev 1733)
@@ -248,6 +248,7 @@
outputCharChunk.setChars(null, 0, 0);
closed = false;
suspended = false;
+ doFlush = false;
if (conv!= null) {
conv.recycle();
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2011-06-06 12:10:58 UTC (rev 1732)
+++ trunk/webapps/docs/changelog.xml 2011-06-07 15:23:58 UTC (rev 1733)
@@ -16,6 +16,16 @@
<body>
+<section name="JBoss Web 7.0.0.CR3 (remm)">
+ <subsection name="Catalina">
+ <changelog>
+ <fix>
+ <bug>51324</bug>: Recycle should reset the OutputBuffer doFlush flag. (remm)
+ </fix>
+ </changelog>
+ </subsection>
+</section>
+
<section name="JBoss Web 7.0.0.CR2 (remm)">
<subsection name="Catalina">
<changelog>
13 years, 6 months
JBossWeb SVN: r1732 - branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/loader.
by jbossweb-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2011-06-06 08:10:58 -0400 (Mon, 06 Jun 2011)
New Revision: 1732
Modified:
branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/loader/WebappClassLoader.java
Log:
Fix CVE-2010-1622.
Modified: branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/loader/WebappClassLoader.java
===================================================================
--- branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/loader/WebappClassLoader.java 2011-06-06 12:05:32 UTC (rev 1731)
+++ branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/loader/WebappClassLoader.java 2011-06-06 12:10:58 UTC (rev 1732)
@@ -1425,7 +1425,7 @@
public URL[] getURLs() {
if (repositoryURLs != null) {
- return repositoryURLs;
+ return repositoryURLs.clone();
}
URL[] external = super.getURLs();
@@ -1454,7 +1454,7 @@
repositoryURLs = new URL[0];
}
- return repositoryURLs;
+ return repositoryURLs.clone();
}
13 years, 6 months
JBossWeb SVN: r1731 - in branches/2.1.x: webapps/docs and 1 other directory.
by jbossweb-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2011-06-06 08:05:32 -0400 (Mon, 06 Jun 2011)
New Revision: 1731
Modified:
branches/2.1.x/java/org/apache/catalina/loader/WebappClassLoader.java
branches/2.1.x/webapps/docs/changelog.xml
Log:
Fix CVE-2010-1622.
Modified: branches/2.1.x/java/org/apache/catalina/loader/WebappClassLoader.java
===================================================================
--- branches/2.1.x/java/org/apache/catalina/loader/WebappClassLoader.java 2011-05-31 15:47:44 UTC (rev 1730)
+++ branches/2.1.x/java/org/apache/catalina/loader/WebappClassLoader.java 2011-06-06 12:05:32 UTC (rev 1731)
@@ -1417,7 +1417,7 @@
public URL[] getURLs() {
if (repositoryURLs != null) {
- return repositoryURLs;
+ return repositoryURLs.clone();
}
URL[] external = super.getURLs();
@@ -1446,7 +1446,7 @@
repositoryURLs = new URL[0];
}
- return repositoryURLs;
+ return repositoryURLs.clone();
}
Modified: branches/2.1.x/webapps/docs/changelog.xml
===================================================================
--- branches/2.1.x/webapps/docs/changelog.xml 2011-05-31 15:47:44 UTC (rev 1730)
+++ branches/2.1.x/webapps/docs/changelog.xml 2011-06-06 12:05:32 UTC (rev 1731)
@@ -19,6 +19,11 @@
<subsection name="Catalina">
<changelog>
<fix>
+ Return a copy of the current URLs for the <code>WebappClassLoader</code>
+ to prevent modification. This facilitated, although it wasn't the root
+ cause, CVE-2010-1622. (markt)
+ </fix>
+ <fix>
<bug>46982</bug>: Correct reporting of DST offset in access logs. (markt)
</fix>
</changelog>
13 years, 6 months