JBossWeb SVN: r1905 - trunk/java/org/apache/jasper/compiler.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2011-12-22 09:19:32 -0500 (Thu, 22 Dec 2011)
New Revision: 1905
Modified:
trunk/java/org/apache/jasper/compiler/Validator.java
Log:
Similar to JBWEB-211, improve exception handling.
Modified: trunk/java/org/apache/jasper/compiler/Validator.java
===================================================================
--- trunk/java/org/apache/jasper/compiler/Validator.java 2011-12-22 13:55:11 UTC (rev 1904)
+++ trunk/java/org/apache/jasper/compiler/Validator.java 2011-12-22 14:19:32 UTC (rev 1905)
@@ -1213,9 +1213,9 @@
try {
jspAttrs[i].validateEL(this.pageInfo.getExpressionFactory(), ctx);
} catch (ELException e) {
- this.err.jspError(n.getStart(),
+ this.err.jspError(n,
"jsp.error.invalid.expression",
- attrs.getValue(i), e.toString());
+ attrs.getValue(i), e);
}
} else {
// Runtime expression
12 years, 4 months
JBossWeb SVN: r1904 - branches/2.1.x/java/org/jboss/web/cluster.
by jbossweb-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2011-12-22 08:55:11 -0500 (Thu, 22 Dec 2011)
New Revision: 1904
Modified:
branches/2.1.x/java/org/jboss/web/cluster/ClusterListener.java
Log:
Fix the mod_cluster ping tests.
Modified: branches/2.1.x/java/org/jboss/web/cluster/ClusterListener.java
===================================================================
--- branches/2.1.x/java/org/jboss/web/cluster/ClusterListener.java 2011-12-21 13:08:48 UTC (rev 1903)
+++ branches/2.1.x/java/org/jboss/web/cluster/ClusterListener.java 2011-12-22 13:55:11 UTC (rev 1904)
@@ -712,7 +712,23 @@
return result.toString();
}
public String doProxyPing(String scheme, String host, int port) {
- return doProxyPing(scheme + "://" + host + String.valueOf(port));
+ HashMap<String, String> parameters = new HashMap<String, String>();
+ if (scheme != null)
+ parameters.put("Scheme", scheme);
+ if (host != null)
+ parameters.put("Host", host);
+ if (port != 0)
+ parameters.put("Port", String.valueOf(port));
+ // Send PING * request
+ Proxy[] local = proxies;
+ StringBuffer result = new StringBuffer();
+ for (int i = 0; i < local.length; i++) {
+ result.append("Proxy[").append(i).append("]: [").append(local[i].address)
+ .append(':').append(local[i].port).append("]: \r\n");
+ result.append(sendRequest("PING", true, parameters, i));
+ result.append("\r\n");
+ }
+ return result.toString();
}
/**
12 years, 4 months
JBossWeb SVN: r1903 - branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/tomcat/util/http.
by jbossweb-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2011-12-21 08:08:48 -0500 (Wed, 21 Dec 2011)
New Revision: 1903
Modified:
branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/tomcat/util/http/MimeHeaders.java
branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/tomcat/util/http/Parameters.java
Log:
Port r1858 from trunk.
Modified: branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/tomcat/util/http/MimeHeaders.java
===================================================================
--- branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/tomcat/util/http/MimeHeaders.java 2011-12-21 12:52:17 UTC (rev 1902)
+++ branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/tomcat/util/http/MimeHeaders.java 2011-12-21 13:08:48 UTC (rev 1903)
@@ -23,9 +23,6 @@
import org.apache.tomcat.util.buf.MessageBytes;
-/* XXX XXX XXX Need a major rewrite !!!!
- */
-
/**
* This class is used to contain standard internet message headers,
* used for SMTP (RFC822) and HTTP (RFC2068) messages as well as for
@@ -79,12 +76,6 @@
* to avoid inside tomcat. The goal is to use _only_ MessageByte-based Fields,
* and reduce to 0 the memory overhead of tomcat.
*
- * TODO:
- * XXX one-buffer parsing - for http ( other protocols don't need that )
- * XXX remove unused methods
- * XXX External enumerations, with 0 GC.
- * XXX use HeaderName ID
- *
*
* @author dac(a)eng.sun.com
* @author James Todd [gonzo(a)eng.sun.com]
@@ -93,9 +84,11 @@
*/
public class MimeHeaders {
/** Initial size - should be == average number of headers per request
- * XXX make it configurable ( fine-tuning of web-apps )
*/
public static final int DEFAULT_HEADER_SIZE=8;
+ protected static final int MAX_COUNT =
+ Integer.valueOf(System.getProperty("org.apache.tomcat.util.http.MimeHeaders.MAX_COUNT", "128")).intValue();
+
/**
* The header fields.
@@ -216,6 +209,9 @@
MimeHeaderField mh;
int len = headers.length;
if (count >= len) {
+ if (count >= MAX_COUNT) {
+ throw new IllegalStateException("Header count exceeded allowed maximum: " + MAX_COUNT);
+ }
// expand header list array
MimeHeaderField tmp[] = new MimeHeaderField[count * 2];
System.arraycopy(headers, 0, tmp, 0, len);
@@ -326,9 +322,7 @@
* @param name the name of the header field to be removed
*/
public void removeHeader(String name) {
- // XXX
// warning: rather sticky code; heavily tuned
-
for (int i = 0; i < count; i++) {
if (headers[i].getName().equalsIgnoreCase(name)) {
removeHeader(i--);
Modified: branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/tomcat/util/http/Parameters.java
===================================================================
--- branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/tomcat/util/http/Parameters.java 2011-12-21 12:52:17 UTC (rev 1902)
+++ branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/tomcat/util/http/Parameters.java 2011-12-21 13:08:48 UTC (rev 1903)
@@ -51,6 +51,8 @@
MessageBytes decodedQuery=MessageBytes.newInstance();
public static final int INITIAL_SIZE=4;
+ protected static final int MAX_COUNT =
+ Integer.valueOf(System.getProperty("org.apache.tomcat.util.http.Parameters.MAX_COUNT", "512")).intValue();
// Garbage-less parameter merging.
// In a sub-request with parameters, the new parameters
@@ -175,6 +177,8 @@
values[i+ oldValues.length] = newValues[i];
}
} else {
+ if (paramHashStringArray.size() >=MAX_COUNT)
+ throw new IllegalStateException("Parameter count exceeded allowed maximum: " + MAX_COUNT);
values = newValues;
}
12 years, 4 months
JBossWeb SVN: r1902 - 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-12-21 07:52:17 -0500 (Wed, 21 Dec 2011)
New Revision: 1902
Modified:
branches/2.1.x/java/org/apache/tomcat/util/http/MimeHeaders.java
branches/2.1.x/java/org/apache/tomcat/util/http/Parameters.java
branches/2.1.x/webapps/docs/changelog.xml
Log:
Port r1858 from trunk.
Modified: branches/2.1.x/java/org/apache/tomcat/util/http/MimeHeaders.java
===================================================================
--- branches/2.1.x/java/org/apache/tomcat/util/http/MimeHeaders.java 2011-12-21 09:03:03 UTC (rev 1901)
+++ branches/2.1.x/java/org/apache/tomcat/util/http/MimeHeaders.java 2011-12-21 12:52:17 UTC (rev 1902)
@@ -23,9 +23,6 @@
import org.apache.tomcat.util.buf.MessageBytes;
-/* XXX XXX XXX Need a major rewrite !!!!
- */
-
/**
* This class is used to contain standard internet message headers,
* used for SMTP (RFC822) and HTTP (RFC2068) messages as well as for
@@ -77,12 +74,6 @@
* to avoid inside tomcat. The goal is to use _only_ MessageByte-based Fields,
* and reduce to 0 the memory overhead of tomcat.
*
- * TODO:
- * XXX one-buffer parsing - for http ( other protocols don't need that )
- * XXX remove unused methods
- * XXX External enumerations, with 0 GC.
- * XXX use HeaderName ID
- *
*
* @author dac(a)eng.sun.com
* @author James Todd [gonzo(a)eng.sun.com]
@@ -212,9 +203,10 @@
}
/** Initial size - should be == average number of headers per request
- * XXX make it configurable ( fine-tuning of web-apps )
*/
public static final int DEFAULT_HEADER_SIZE = 8;
+ protected static final int MAX_COUNT =
+ Integer.valueOf(System.getProperty("org.apache.tomcat.util.http.MimeHeaders.MAX_COUNT", "128")).intValue();
/**
* The header fields.
@@ -333,6 +325,9 @@
MimeHeaderField mh;
int len = headers.length;
if (count >= len) {
+ if (count >= MAX_COUNT) {
+ throw new IllegalStateException("Header count exceeded allowed maximum: " + MAX_COUNT);
+ }
// expand header list array
MimeHeaderField tmp[] = new MimeHeaderField[count * 2];
System.arraycopy(headers, 0, tmp, 0, len);
@@ -441,9 +436,7 @@
* @param name the name of the header field to be removed
*/
public void removeHeader(String name) {
- // XXX
// warning: rather sticky code; heavily tuned
-
for (int i = 0; i < count; i++) {
if (headers[i].getName().equalsIgnoreCase(name)) {
removeHeader(i--);
Modified: branches/2.1.x/java/org/apache/tomcat/util/http/Parameters.java
===================================================================
--- branches/2.1.x/java/org/apache/tomcat/util/http/Parameters.java 2011-12-21 09:03:03 UTC (rev 1901)
+++ branches/2.1.x/java/org/apache/tomcat/util/http/Parameters.java 2011-12-21 12:52:17 UTC (rev 1902)
@@ -40,6 +40,8 @@
protected static final int LAST = -1;
public static final int INITIAL_SIZE = 8;
protected static final String[] ARRAY_TYPE = new String[0];
+ protected static final int MAX_COUNT =
+ Integer.valueOf(System.getProperty("org.apache.tomcat.util.http.Parameters.MAX_COUNT", "512")).intValue();
protected class Field {
MessageBytes name = MessageBytes.newInstance();
@@ -212,6 +214,9 @@
int len = fields.length;
int pos = count;
if (count >= len) {
+ if (count >= MAX_COUNT) {
+ throw new IllegalStateException("Parameter count exceeded allowed maximum: " + MAX_COUNT);
+ }
// expand header list array
Field tmp[] = new Field[pos * 2];
System.arraycopy(fields, 0, tmp, 0, len);
Modified: branches/2.1.x/webapps/docs/changelog.xml
===================================================================
--- branches/2.1.x/webapps/docs/changelog.xml 2011-12-21 09:03:03 UTC (rev 1901)
+++ branches/2.1.x/webapps/docs/changelog.xml 2011-12-21 12:52:17 UTC (rev 1902)
@@ -28,6 +28,10 @@
<fix>
<bug>51698</bug>: Fix CVE-2011-3190. Prevent AJP message injection. (markt)
</fix>
+ <fix>
+ Add system properties which restrict parameter count (org.apache.tomcat.util.http.Parameters.MAX_COUNT
+ default to 512) and header count (org.apache.tomcat.util.http.MimeHeaders.MAX_COUNT to 128). (remm)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
12 years, 4 months
JBossWeb SVN: r1901 - tags.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2011-12-21 04:03:03 -0500 (Wed, 21 Dec 2011)
New Revision: 1901
Added:
tags/JBOSSWEB_7_0_7_FINAL/
Log:
Web 7.0.7.
12 years, 4 months
JBossWeb SVN: r1900 - in tags/JBOSSWEB_2_1_13_TEST: res and 1 other directory.
by jbossweb-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2011-12-20 11:42:29 -0500 (Tue, 20 Dec 2011)
New Revision: 1900
Removed:
tags/JBOSSWEB_2_1_13_TEST/res/maven/
Modified:
tags/JBOSSWEB_2_1_13_TEST/build.properties.default
tags/JBOSSWEB_2_1_13_TEST/dist.xml
tags/JBOSSWEB_2_1_13_TEST/res/el-api-pom.xml
tags/JBOSSWEB_2_1_13_TEST/res/jasper-jdt-pom.xml
tags/JBOSSWEB_2_1_13_TEST/res/jbossweb-pom.xml
tags/JBOSSWEB_2_1_13_TEST/res/jsp-api-pom.xml
tags/JBOSSWEB_2_1_13_TEST/res/servlet-api-pom.xml
Log:
Fix the maven/nexus new requirements,
Modified: tags/JBOSSWEB_2_1_13_TEST/build.properties.default
===================================================================
--- tags/JBOSSWEB_2_1_13_TEST/build.properties.default 2011-12-20 11:32:47 UTC (rev 1899)
+++ tags/JBOSSWEB_2_1_13_TEST/build.properties.default 2011-12-20 16:42:29 UTC (rev 1900)
@@ -12,15 +12,15 @@
# ----- Version Control Flags -----
version.major=2
version.minor=1
-version.build=12
+version.build=13
version.patch=0
-version.tag=SNAPSHOT
+version.tag=TEST
# ----- Default Base Path for Dependent Packages -----
# Please note this path must be absolute, not relative,
# as it is referenced with different working directory
# contexts by the various build scripts.
-base.path=/usr/share/java
+base.path=/home/jfclere/java
#base.path=C:/path/to/the/repository
#base.path=/usr/local
Modified: tags/JBOSSWEB_2_1_13_TEST/dist.xml
===================================================================
--- tags/JBOSSWEB_2_1_13_TEST/dist.xml 2011-12-20 11:32:47 UTC (rev 1899)
+++ tags/JBOSSWEB_2_1_13_TEST/dist.xml 2011-12-20 16:42:29 UTC (rev 1900)
@@ -299,71 +299,45 @@
<!-- Linux/Unix execs -->
<exec dir="." executable="/bin/sh" os="Linux">
<arg value="-c" />
- <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/el-api.jar -DpomFile=${tomcat.jars}/el-api-pom.xml -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id}"/>
+ <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/jbossweb-src.zip -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id} -DgroupId=jboss.web -DartifactId=jbossweb -Dversion=${version} -Dclassifier=sources"/>
</exec>
<exec dir="." executable="/bin/sh" os="Linux">
<arg value="-c" />
- <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/jasper-jdt.jar -DpomFile=${tomcat.jars}/jasper-jdt-pom.xml -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id}"/>
+ <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/el-api-src.zip -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id} -DgroupId=jboss.web -DartifactId=el-api -Dversion=${version} -Dclassifier=sources"/>
</exec>
<exec dir="." executable="/bin/sh" os="Linux">
<arg value="-c" />
- <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/jbossweb.jar -DpomFile=${tomcat.jars}/jbossweb-pom.xml -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id}"/>
+ <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/servlet-api-src.zip -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id} -DgroupId=jboss.web -DartifactId=servlet-api -Dversion=${version} -Dclassifier=sources"/>
</exec>
<exec dir="." executable="/bin/sh" os="Linux">
<arg value="-c" />
- <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/jsp-api.jar -DpomFile=${tomcat.jars}/jsp-api-pom.xml -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id}"/>
+ <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/jsp-api-src.zip -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id} -DgroupId=jboss.web -DartifactId=jsp-api -Dversion=${version} -Dclassifier=sources"/>
</exec>
<exec dir="." executable="/bin/sh" os="Linux">
<arg value="-c" />
- <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/servlet-api.jar -DpomFile=${tomcat.jars}/servlet-api-pom.xml -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id}"/>
+ <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/jasper-jdt-src.jar -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id} -DgroupId=jboss.web -DartifactId=jasper-jdt -Dversion=${version} -Dclassifier=sources"/>
</exec>
<exec dir="." executable="/bin/sh" os="Linux">
<arg value="-c" />
- <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/jbossweb-src.zip -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id} -DgroupId=jboss.web -DartifactId=jbossweb -Dversion=${version} -Dclassifier=sources"/>
+ <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/el-api.jar -DpomFile=${tomcat.jars}/el-api-pom.xml -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id} -DgeneratePom=false"/>
</exec>
<exec dir="." executable="/bin/sh" os="Linux">
<arg value="-c" />
- <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/el-api-src.zip -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id} -DgroupId=jboss.web -DartifactId=el-api -Dversion=${version} -Dclassifier=sources"/>
+ <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/jasper-jdt.jar -DpomFile=${tomcat.jars}/jasper-jdt-pom.xml -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id} -DgeneratePom=false"/>
</exec>
<exec dir="." executable="/bin/sh" os="Linux">
<arg value="-c" />
- <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/servlet-api-src.zip -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id} -DgroupId=jboss.web -DartifactId=servlet-api -Dversion=${version} -Dclassifier=sources"/>
+ <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/jbossweb.jar -DpomFile=${tomcat.jars}/jbossweb-pom.xml -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id} -DgeneratePom=false"/>
</exec>
<exec dir="." executable="/bin/sh" os="Linux">
<arg value="-c" />
- <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/jsp-api-src.zip -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id} -DgroupId=jboss.web -DartifactId=jsp-api -Dversion=${version} -Dclassifier=sources"/>
+ <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/jsp-api.jar -DpomFile=${tomcat.jars}/jsp-api-pom.xml -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id} -DgeneratePom=false"/>
</exec>
<exec dir="." executable="/bin/sh" os="Linux">
<arg value="-c" />
- <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/jasper-jdt-src.jar -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id} -DgroupId=jboss.web -DartifactId=jasper-jdt -Dversion=${version} -Dclassifier=sources"/>
+ <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/servlet-api.jar -DpomFile=${tomcat.jars}/servlet-api-pom.xml -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id} -DgeneratePom=false"/>
</exec>
- <!-- Windows exec -->
- <exec dir="." executable="cmd" os="Windows NT">
- <arg value="/c" />
- <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/el-api.jar -DpomFile=${tomcat.jars}/el-api-pom.xml -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id}"/>
- </exec>
- <exec dir="." executable="cmd" os="Windows NT">
- <arg value="/c" />
- <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/jasper-jdt.jar -DpomFile=${tomcat.jars}/jasper-jdt-pom.xml -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id}"/>
- </exec>
- <exec dir="." executable="cmd" os="Windows NT">
- <arg value="/c" />
- <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/jbossweb.jar -DpomFile=${tomcat.jars}/jbossweb-pom.xml -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id}"/>
- </exec>
- <exec dir="." executable="cmd" os="Windows NT">
- <arg value="/c" />
- <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/jsp-api.jar -DpomFile=${tomcat.jars}/jsp-api-pom.xml -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id}"/>
- </exec>
- <exec dir="." executable="cmd" os="Windows NT">
- <arg value="/c" />
- <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/servlet-api.jar -DpomFile=${tomcat.jars}/servlet-api-pom.xml -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id}"/>
- </exec>
- <exec dir="." executable="cmd" os="Windows NT">
- <arg value="/c" />
- <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/jbossweb-src.zip -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id} -DgroupId=jboss.web -DartifactId=jbossweb -Dversion=${version} -Dclassifier=sources"/>
- </exec>
-
</target>
<!-- Packages the core zip distro -->
Modified: tags/JBOSSWEB_2_1_13_TEST/res/el-api-pom.xml
===================================================================
--- tags/JBOSSWEB_2_1_13_TEST/res/el-api-pom.xml 2011-12-20 11:32:47 UTC (rev 1899)
+++ tags/JBOSSWEB_2_1_13_TEST/res/el-api-pom.xml 2011-12-20 16:42:29 UTC (rev 1900)
@@ -4,4 +4,24 @@
<groupId>jboss.web</groupId>
<artifactId>el-api</artifactId>
<version>@VERSION@</version>
+ <description>Expression language package</description>
+ <name>el-api</name>
+ <packaging>pom</packaging>
+ <url>http://jboss.org/jbossweb</url>
+ <scm>
+ <url>http://fisheye.jboss.org/browse/jbossweb/branches/2.1.x</url>
+ </scm>
+ <developers>
+ <developer>
+ <id>JBossWeb developers</id>
+ </developer>
+ <developer>
+ <id>ASF Tomcat developers</id>
+ </developer>
+ </developers>
+ <licenses>
+ <license>
+ <name>GNU GPL Version 3</name>
+ </license>
+ </licenses>
</project>
Modified: tags/JBOSSWEB_2_1_13_TEST/res/jasper-jdt-pom.xml
===================================================================
--- tags/JBOSSWEB_2_1_13_TEST/res/jasper-jdt-pom.xml 2011-12-20 11:32:47 UTC (rev 1899)
+++ tags/JBOSSWEB_2_1_13_TEST/res/jasper-jdt-pom.xml 2011-12-20 16:42:29 UTC (rev 1900)
@@ -4,4 +4,26 @@
<groupId>jboss.web</groupId>
<artifactId>jasper-jdt</artifactId>
<version>@VERSION@</version>
+ <description>Jasper javac compiler extension for Eclipse JDT</description>
+ <name>jasper-jdt</name>
+ <url>http://jboss.org/jbossweb</url>
+ <scm>
+ <url>http://fisheye.jboss.org/browse/jbossweb/branches/2.1.x</url>
+ </scm>
+ <developers>
+ <developer>
+ <id>JBossWeb developers</id>
+ </developer>
+ <developer>
+ <id>ASF Tomcat developers</id>
+ </developer>
+ <developer>
+ <id>Eclipse developers</id>
+ </developer>
+ </developers>
+ <licenses>
+ <license>
+ <name>GNU GPL Version 3</name>
+ </license>
+ </licenses>
</project>
Modified: tags/JBOSSWEB_2_1_13_TEST/res/jbossweb-pom.xml
===================================================================
--- tags/JBOSSWEB_2_1_13_TEST/res/jbossweb-pom.xml 2011-12-20 11:32:47 UTC (rev 1899)
+++ tags/JBOSSWEB_2_1_13_TEST/res/jbossweb-pom.xml 2011-12-20 16:42:29 UTC (rev 1900)
@@ -4,4 +4,23 @@
<groupId>jboss.web</groupId>
<artifactId>jbossweb</artifactId>
<version>@VERSION@</version>
+ <description>JBossWeb jar bundle</description>
+ <name>jbossweb</name>
+ <url>http://jboss.org/jbossweb</url>
+ <scm>
+ <url>http://fisheye.jboss.org/browse/jbossweb/branches/2.1.x</url>
+ </scm>
+ <developers>
+ <developer>
+ <id>JBossWeb developers</id>
+ </developer>
+ <developer>
+ <id>ASF Tomcat developers</id>
+ </developer>
+ </developers>
+ <licenses>
+ <license>
+ <name>GNU GPL Version 3</name>
+ </license>
+ </licenses>
</project>
Modified: tags/JBOSSWEB_2_1_13_TEST/res/jsp-api-pom.xml
===================================================================
--- tags/JBOSSWEB_2_1_13_TEST/res/jsp-api-pom.xml 2011-12-20 11:32:47 UTC (rev 1899)
+++ tags/JBOSSWEB_2_1_13_TEST/res/jsp-api-pom.xml 2011-12-20 16:42:29 UTC (rev 1900)
@@ -4,4 +4,23 @@
<groupId>jboss.web</groupId>
<artifactId>jsp-api</artifactId>
<version>@VERSION@</version>
+ <description>JSP package</description>
+ <name>jsp-api</name>
+ <url>http://jboss.org/jbossweb</url>
+ <scm>
+ <url>http://fisheye.jboss.org/browse/jbossweb/branches/2.1.x</url>
+ </scm>
+ <developers>
+ <developer>
+ <id>JBossWeb developers</id>
+ </developer>
+ <developer>
+ <id>ASF Tomcat developers</id>
+ </developer>
+ </developers>
+ <licenses>
+ <license>
+ <name>GNU GPL Version 3</name>
+ </license>
+ </licenses>
</project>
Modified: tags/JBOSSWEB_2_1_13_TEST/res/servlet-api-pom.xml
===================================================================
--- tags/JBOSSWEB_2_1_13_TEST/res/servlet-api-pom.xml 2011-12-20 11:32:47 UTC (rev 1899)
+++ tags/JBOSSWEB_2_1_13_TEST/res/servlet-api-pom.xml 2011-12-20 16:42:29 UTC (rev 1900)
@@ -4,4 +4,23 @@
<groupId>jboss.web</groupId>
<artifactId>servlet-api</artifactId>
<version>@VERSION@</version>
+ <description>javax.servlet package</description>
+ <name>servlet-api</name>
+ <url>http://jboss.org/jbossweb</url>
+ <scm>
+ <url>http://fisheye.jboss.org/browse/jbossweb/branches/2.1.x</url>
+ </scm>
+ <developers>
+ <developer>
+ <id>JBossWeb developers</id>
+ </developer>
+ <developer>
+ <id>ASF Tomcat developers</id>
+ </developer>
+ </developers>
+ <licenses>
+ <license>
+ <name>GNU GPL Version 3</name>
+ </license>
+ </licenses>
</project>
12 years, 4 months
JBossWeb SVN: r1899 - tags.
by jbossweb-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2011-12-20 06:32:47 -0500 (Tue, 20 Dec 2011)
New Revision: 1899
Added:
tags/JBOSSWEB_2_1_13_TEST/
Log:
Test version for mod_cluster tests.
12 years, 4 months
JBossWeb SVN: r1898 - in branches: 3.0.x/java/org/apache/catalina/connector and 1 other directory.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2011-12-20 04:46:54 -0500 (Tue, 20 Dec 2011)
New Revision: 1898
Modified:
branches/2.1.x/java/org/apache/catalina/connector/OutputBuffer.java
branches/3.0.x/java/org/apache/catalina/connector/OutputBuffer.java
Log:
Port buffering fix for character output.
Modified: branches/2.1.x/java/org/apache/catalina/connector/OutputBuffer.java
===================================================================
--- branches/2.1.x/java/org/apache/catalina/connector/OutputBuffer.java 2011-12-19 17:25:14 UTC (rev 1897)
+++ branches/2.1.x/java/org/apache/catalina/connector/OutputBuffer.java 2011-12-20 09:46:54 UTC (rev 1898)
@@ -464,6 +464,10 @@
outputCharChunk.setChars(buf, off, len);
while (outputCharChunk.getLength() > 0) {
conv.convert(outputCharChunk, bb);
+ if (bb.getLength() == 0) {
+ // Break out of the loop if more chars are needed to produce any output
+ break;
+ }
if (outputCharChunk.getLength() > 0) {
bb.flushBuffer();
}
Modified: branches/3.0.x/java/org/apache/catalina/connector/OutputBuffer.java
===================================================================
--- branches/3.0.x/java/org/apache/catalina/connector/OutputBuffer.java 2011-12-19 17:25:14 UTC (rev 1897)
+++ branches/3.0.x/java/org/apache/catalina/connector/OutputBuffer.java 2011-12-20 09:46:54 UTC (rev 1898)
@@ -464,6 +464,10 @@
outputCharChunk.setChars(buf, off, len);
while (outputCharChunk.getLength() > 0) {
conv.convert(outputCharChunk, bb);
+ if (bb.getLength() == 0) {
+ // Break out of the loop if more chars are needed to produce any output
+ break;
+ }
if (outputCharChunk.getLength() > 0) {
bb.flushBuffer();
}
12 years, 4 months
JBossWeb SVN: r1897 - in trunk: webapps/docs and 1 other directory.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2011-12-19 12:25:14 -0500 (Mon, 19 Dec 2011)
New Revision: 1897
Modified:
trunk/java/org/apache/catalina/connector/OutputBuffer.java
trunk/webapps/docs/changelog.xml
Log:
Fix buffering issue when encoding characters.
Modified: trunk/java/org/apache/catalina/connector/OutputBuffer.java
===================================================================
--- trunk/java/org/apache/catalina/connector/OutputBuffer.java 2011-12-15 16:45:53 UTC (rev 1896)
+++ trunk/java/org/apache/catalina/connector/OutputBuffer.java 2011-12-19 17:25:14 UTC (rev 1897)
@@ -465,6 +465,10 @@
outputCharChunk.setChars(buf, off, len);
while (outputCharChunk.getLength() > 0) {
conv.convert(outputCharChunk, bb);
+ if (bb.getLength() == 0) {
+ // Break out of the loop if more chars are needed to produce any output
+ break;
+ }
if (outputCharChunk.getLength() > 0) {
bb.flushBuffer();
}
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2011-12-15 16:45:53 UTC (rev 1896)
+++ trunk/webapps/docs/changelog.xml 2011-12-19 17:25:14 UTC (rev 1897)
@@ -16,6 +16,16 @@
<body>
+<section name="JBoss Web 7.0.7.Final (remm)">
+ <subsection name="Catalina">
+ <changelog>
+ <fix>
+ Fix buffering issue when encoding certain characters. (remm)
+ </fix>
+ </changelog>
+ </subsection>
+</section>
+
<section name="JBoss Web 7.0.6.Final (remm)">
<subsection name="Jasper">
<changelog>
12 years, 4 months
JBossWeb SVN: r1896 - in branches/JBOSSWEB_2_1_10_GA_JBPAPP-7745: java/org/apache/catalina/core and 1 other directories.
by jbossweb-commits＠lists.jboss.org
Author: bmaxwell
Date: 2011-12-15 11:45:53 -0500 (Thu, 15 Dec 2011)
New Revision: 1896
Modified:
branches/JBOSSWEB_2_1_10_GA_JBPAPP-7745/build.xml
branches/JBOSSWEB_2_1_10_GA_JBPAPP-7745/java/org/apache/catalina/core/StandardContext.java
branches/JBOSSWEB_2_1_10_GA_JBPAPP-7745/webapps/docs/changelog.xml
Log:
[JBPAPP-7745] fix org.apache.naming.resources.DirContextURLStreamHandler holds onto ClassLoader after deployments have been undeployed
Modified: branches/JBOSSWEB_2_1_10_GA_JBPAPP-7745/build.xml
===================================================================
--- branches/JBOSSWEB_2_1_10_GA_JBPAPP-7745/build.xml 2011-12-15 15:22:11 UTC (rev 1895)
+++ branches/JBOSSWEB_2_1_10_GA_JBPAPP-7745/build.xml 2011-12-15 16:45:53 UTC (rev 1896)
@@ -17,7 +17,7 @@
<property name="version.major" value="2" />
<property name="version.minor" value="1" />
<property name="version.build" value="0" />
- <property name="version.patch" value="0" />
+ <property name="version.patch" value="JBPAPP-7745" />
<property name="version.tag" value="SNAPSHOT" />
<property name="version" value="${version.major}.${version.minor}.${version.build}.${version.tag}" />
<property name="version.number" value="${version.major}.${version.minor}.${version.build}.${version.patch}" />
Modified: branches/JBOSSWEB_2_1_10_GA_JBPAPP-7745/java/org/apache/catalina/core/StandardContext.java
===================================================================
--- branches/JBOSSWEB_2_1_10_GA_JBPAPP-7745/java/org/apache/catalina/core/StandardContext.java 2011-12-15 15:22:11 UTC (rev 1895)
+++ branches/JBOSSWEB_2_1_10_GA_JBPAPP-7745/java/org/apache/catalina/core/StandardContext.java 2011-12-15 16:45:53 UTC (rev 1896)
@@ -4822,6 +4822,8 @@
*/
private void unbindThread(ClassLoader oldContextClassLoader) {
+ DirContextURLStreamHandler.unbind();
+
Thread.currentThread().setContextClassLoader(oldContextClassLoader);
oldContextClassLoader = null;
@@ -4830,8 +4832,6 @@
ContextBindings.unbindThread(this, this);
}
- DirContextURLStreamHandler.unbind();
-
}
Modified: branches/JBOSSWEB_2_1_10_GA_JBPAPP-7745/webapps/docs/changelog.xml
===================================================================
--- branches/JBOSSWEB_2_1_10_GA_JBPAPP-7745/webapps/docs/changelog.xml 2011-12-15 15:22:11 UTC (rev 1895)
+++ branches/JBOSSWEB_2_1_10_GA_JBPAPP-7745/webapps/docs/changelog.xml 2011-12-15 16:45:53 UTC (rev 1896)
@@ -71,6 +71,10 @@
<update>
Add new PING method for mod_cluster. (jfclere)
</update>
+ <fix>
+ <jboss-jira>AS7-1098</jboss-jira>: Call context classloader unbind with the right
+ classloader. (remm)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
12 years, 4 months