JBossWeb SVN: r925 - in trunk: webapps/docs and 1 other directory.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2009-02-09 14:55:07 -0500 (Mon, 09 Feb 2009)
New Revision: 925
Modified:
trunk/java/org/apache/catalina/startup/ContextConfig.java
trunk/java/org/apache/catalina/startup/HostConfig.java
trunk/webapps/docs/changelog.xml
Log:
- Two fixes for appBase matching in standalone.
Modified: trunk/java/org/apache/catalina/startup/ContextConfig.java
===================================================================
--- trunk/java/org/apache/catalina/startup/ContextConfig.java 2009-02-09 13:42:08 UTC (rev 924)
+++ trunk/java/org/apache/catalina/startup/ContextConfig.java 2009-02-09 19:55:07 UTC (rev 925)
@@ -906,7 +906,7 @@
}
}
- if (docBase.startsWith(canonicalAppBase.getPath())) {
+ if (docBase.startsWith(canonicalAppBase.getPath() + File.separatorChar)) {
docBase = docBase.substring(canonicalAppBase.getPath().length());
docBase = docBase.replace(File.separatorChar, '/');
if (docBase.startsWith("/")) {
Modified: trunk/java/org/apache/catalina/startup/HostConfig.java
===================================================================
--- trunk/java/org/apache/catalina/startup/HostConfig.java 2009-02-09 13:42:08 UTC (rev 924)
+++ trunk/java/org/apache/catalina/startup/HostConfig.java 2009-02-09 19:55:07 UTC (rev 925)
@@ -1079,7 +1079,7 @@
try {
File current = new File(resources[j]);
current = current.getCanonicalFile();
- if ((current.getAbsolutePath().startsWith(appBase().getAbsolutePath()))
+ if ((current.getAbsolutePath().startsWith(appBase().getAbsolutePath() + File.separator))
|| (current.getAbsolutePath().startsWith(configBase().getAbsolutePath()))) {
if (log.isDebugEnabled())
log.debug("Delete " + current);
@@ -1120,7 +1120,7 @@
try {
File current = new File(resources[j]);
current = current.getCanonicalFile();
- if ((current.getAbsolutePath().startsWith(appBase().getAbsolutePath()))
+ if ((current.getAbsolutePath().startsWith(appBase().getAbsolutePath() + File.separator))
|| (current.getAbsolutePath().startsWith(configBase().getAbsolutePath()))) {
if (log.isDebugEnabled())
log.debug("Delete " + current);
@@ -1138,7 +1138,7 @@
try {
File current = new File(resources2[j]);
current = current.getCanonicalFile();
- if ((current.getAbsolutePath().startsWith(appBase().getAbsolutePath()))
+ if ((current.getAbsolutePath().startsWith(appBase().getAbsolutePath() + File.separator))
|| ((current.getAbsolutePath().startsWith(configBase().getAbsolutePath())
&& (current.getAbsolutePath().endsWith(".xml"))))) {
if (log.isDebugEnabled())
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2009-02-09 13:42:08 UTC (rev 924)
+++ trunk/webapps/docs/changelog.xml 2009-02-09 19:55:07 UTC (rev 925)
@@ -54,6 +54,12 @@
<fix>
<bug>46606</bug>: Max depth limit configurable in WebDAV Servlet. (markt)
</fix>
+ <fix>
+ <bug>38570</bug>: Fix checking of appBase against docBase. (markt)
+ </fix>
+ <fix>
+ <bug>39013</bug>: Fix appBase test when deleting resources. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
15 years, 2 months
- 1
- 0
JBossWeb SVN: r924 - trunk/java/org/apache/catalina/core.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2009-02-09 08:42:08 -0500 (Mon, 09 Feb 2009)
New Revision: 924
Modified:
trunk/java/org/apache/catalina/core/AnnotationScanner.java
Log:
- Scan for the desired annotations.
Modified: trunk/java/org/apache/catalina/core/AnnotationScanner.java
===================================================================
--- trunk/java/org/apache/catalina/core/AnnotationScanner.java 2009-02-09 13:37:10 UTC (rev 923)
+++ trunk/java/org/apache/catalina/core/AnnotationScanner.java 2009-02-09 13:42:08 UTC (rev 924)
@@ -20,13 +20,12 @@
import java.io.File;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.Enumeration;
+import java.util.List;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
-import javax.naming.Binding;
-import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
import javax.naming.directory.DirContext;
import javax.servlet.annotation.InitParam;
import javax.servlet.annotation.ServletFilter;
@@ -34,15 +33,9 @@
import javax.servlet.annotation.WebServletContextListener;
import org.apache.catalina.Context;
-import org.apache.naming.resources.Resource;
public class AnnotationScanner {
- // FIXME: probably should not be static, and tied to a Context, to allow pluggability ?
-
- public static final Class<?>[] ANNOTATIONS_TYPES =
- { InitParam.class, ServletFilter.class, WebServlet.class, WebServletContextListener.class };
-
public static final boolean USE_JAVASSIST =
Boolean.valueOf(System.getProperty("org.apache.catalina.core.AnnotationScanner.USE_JAVASSIST", "false")).booleanValue();
@@ -51,25 +44,25 @@
*
* @param context
*/
- public static void scan(Context context) {
- // FIXME: obviously needs to return a result
+ public List<Class<?>> scan(Context context) {
+ ArrayList<Class<?>> result = new ArrayList<Class<?>>();
if (context.getLoader().findLoaderRepositories() != null) {
String[] repositories = context.getLoader().findLoaderRepositories();
for (int i = 0; i < repositories.length; i++) {
- System.out.println("Repo: " + repositories[i]);
if (repositories[i].endsWith(".jar")) {
try {
- scanJar(context, new JarFile(repositories[i]));
+ scanJar(result, context, new JarFile(repositories[i]));
} catch (IOException e) {
// Ignore
}
} else {
- scanClasses(context, new File(repositories[i]), "");
+ scanClasses(result, context, new File(repositories[i]), "");
}
}
}
+ return result;
/*
DirContext resources = context.getResources();
DirContext webInfClasses = null;
@@ -99,15 +92,18 @@
/**
* Scan folder containing class files.
*/
- public static void scanClasses(Context context, File folder, String path) {
+ public void scanClasses(List<Class<?>> result, Context context, File folder, String path) {
String[] files = folder.list();
for (int i = 0; i < files.length; i++) {
File file = new File(folder, files[i]);
if (file.isDirectory()) {
- scanClasses(context, file, path + "/" + files[i]);
+ scanClasses(result, context, file, path + "/" + files[i]);
} else if (files[i].endsWith(".class")) {
String className = getClassName(path + "/" + files[i]);
- scanClass(context, className, file, null);
+ Class<?> annotated = scanClass(context, className, file, null);
+ if (annotated != null) {
+ result.add(annotated);
+ }
}
}
}
@@ -143,14 +139,13 @@
/**
* Scan folder containing JAR files.
*/
- public static void scanJars(Context context, DirContext folder) {
+ public void scanJars(List<Class<?>> result, Context context, DirContext folder) {
if (context.getLoader().findLoaderRepositories() != null) {
String[] repositories = context.getLoader().findLoaderRepositories();
for (int i = 0; i < repositories.length; i++) {
- System.out.println("Repo: " + repositories[i]);
if (repositories[i].endsWith(".jar")) {
try {
- scanJar(context, new JarFile(repositories[i]));
+ scanJar(result, context, new JarFile(repositories[i]));
} catch (IOException e) {
// Ignore
}
@@ -188,12 +183,15 @@
/**
* Scan all class files in the given JAR.
*/
- public static void scanJar(Context context, JarFile file) {
+ public void scanJar(List<Class<?>> result, Context context, JarFile file) {
Enumeration<JarEntry> entries = file.entries();
while (entries.hasMoreElements()) {
JarEntry entry = entries.nextElement();
if (entry.getName().endsWith(".class")) {
- scanClass(context, getClassName(entry.getName()), null, entry);
+ Class<?> annotated = scanClass(context, getClassName(entry.getName()), null, entry);
+ if (annotated != null) {
+ result.add(annotated);
+ }
}
}
try {
@@ -208,7 +206,7 @@
* Get class name given a path to a classfile.
* /my/class/MyClass.class -> my.class.MyClass
*/
- public static String getClassName(String filePath) {
+ public String getClassName(String filePath) {
if (filePath.startsWith("/")) {
filePath = filePath.substring(1);
}
@@ -222,20 +220,30 @@
/**
* Scan class for interesting annotations.
*/
- public static boolean scanClass(Context context, String className, File file, JarEntry entry) {
+ public Class<?> scanClass(Context context, String className, File file, JarEntry entry) {
if (USE_JAVASSIST) {
// FIXME: Javassist implementation
+ try {
+
+ return context.getLoader().getClassLoader().loadClass(className);
+ } catch (Throwable t) {
+ // Ignore classloading errors here
+ }
} else {
// Load the class using the classloader, and see if it implements one of the web annotations
try {
- System.out.println("Scan class: " + className);
Class<?> clazz = context.getLoader().getClassLoader().loadClass(className);
+ if (clazz.isAnnotationPresent(InitParam.class)
+ || clazz.isAnnotationPresent(ServletFilter.class)
+ || clazz.isAnnotationPresent(WebServlet.class)
+ || clazz.isAnnotationPresent(WebServletContextListener.class)) {
+ return clazz;
+ }
} catch (Throwable t) {
// Ignore classloading errors here
- System.out.println("CL Error: " + t);
}
}
- return false;
+ return null;
}
15 years, 2 months
- 1
- 0
JBossWeb SVN: r923 - in branches/2.1.x: webapps/docs and 1 other directory.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2009-02-09 08:37:10 -0500 (Mon, 09 Feb 2009)
New Revision: 923
Modified:
branches/2.1.x/java/org/apache/coyote/ajp/AjpAprProcessor.java
branches/2.1.x/java/org/apache/coyote/ajp/AjpProcessor.java
branches/2.1.x/webapps/docs/changelog.xml
Log:
- HTTP/1.0 handling difference in the new AJP connectors.
Modified: branches/2.1.x/java/org/apache/coyote/ajp/AjpAprProcessor.java
===================================================================
--- branches/2.1.x/java/org/apache/coyote/ajp/AjpAprProcessor.java 2009-02-09 13:37:00 UTC (rev 922)
+++ branches/2.1.x/java/org/apache/coyote/ajp/AjpAprProcessor.java 2009-02-09 13:37:10 UTC (rev 923)
@@ -846,9 +846,13 @@
if (valueMB == null || (valueMB != null && valueMB.isNull()) ) {
// HTTP/1.0
- // Default is what the socket tells us. Overriden if a host is
- // found/parsed
- request.setServerPort(endpoint.getPort());
+ request.setServerPort(request.getLocalPort());
+ try {
+ request.serverName().duplicate(request.localName());
+ } catch (IOException e) {
+ response.setStatus(400);
+ error = true;
+ }
return;
}
Modified: branches/2.1.x/java/org/apache/coyote/ajp/AjpProcessor.java
===================================================================
--- branches/2.1.x/java/org/apache/coyote/ajp/AjpProcessor.java 2009-02-09 13:37:00 UTC (rev 922)
+++ branches/2.1.x/java/org/apache/coyote/ajp/AjpProcessor.java 2009-02-09 13:37:10 UTC (rev 923)
@@ -851,9 +851,13 @@
if (valueMB == null || (valueMB != null && valueMB.isNull()) ) {
// HTTP/1.0
- // Default is what the socket tells us. Overriden if a host is
- // found/parsed
- request.setServerPort(endpoint.getPort());
+ request.setServerPort(request.getLocalPort());
+ try {
+ request.serverName().duplicate(request.localName());
+ } catch (IOException e) {
+ response.setStatus(400);
+ error = true;
+ }
return;
}
Modified: branches/2.1.x/webapps/docs/changelog.xml
===================================================================
--- branches/2.1.x/webapps/docs/changelog.xml 2009-02-09 13:37:00 UTC (rev 922)
+++ branches/2.1.x/webapps/docs/changelog.xml 2009-02-09 13:37:10 UTC (rev 923)
@@ -34,6 +34,9 @@
</subsection>
<subsection name="Coyote">
<changelog>
+ <fix>
+ HTTP/1.0 handling differed from the old org.apache.jk connector. (remm)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
15 years, 2 months
- 1
- 0
JBossWeb SVN: r922 - in trunk: webapps/docs and 1 other directory.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2009-02-09 08:37:00 -0500 (Mon, 09 Feb 2009)
New Revision: 922
Modified:
trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
trunk/java/org/apache/coyote/ajp/AjpProcessor.java
trunk/webapps/docs/changelog.xml
Log:
- HTTP/1.0 handling difference in the new AJP connectors.
Modified: trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
===================================================================
--- trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java 2009-02-04 14:38:37 UTC (rev 921)
+++ trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java 2009-02-09 13:37:00 UTC (rev 922)
@@ -846,9 +846,13 @@
if (valueMB == null || (valueMB != null && valueMB.isNull()) ) {
// HTTP/1.0
- // Default is what the socket tells us. Overriden if a host is
- // found/parsed
- request.setServerPort(endpoint.getPort());
+ request.setServerPort(request.getLocalPort());
+ try {
+ request.serverName().duplicate(request.localName());
+ } catch (IOException e) {
+ response.setStatus(400);
+ error = true;
+ }
return;
}
Modified: trunk/java/org/apache/coyote/ajp/AjpProcessor.java
===================================================================
--- trunk/java/org/apache/coyote/ajp/AjpProcessor.java 2009-02-04 14:38:37 UTC (rev 921)
+++ trunk/java/org/apache/coyote/ajp/AjpProcessor.java 2009-02-09 13:37:00 UTC (rev 922)
@@ -851,9 +851,13 @@
if (valueMB == null || (valueMB != null && valueMB.isNull()) ) {
// HTTP/1.0
- // Default is what the socket tells us. Overriden if a host is
- // found/parsed
- request.setServerPort(endpoint.getPort());
+ request.setServerPort(request.getLocalPort());
+ try {
+ request.serverName().duplicate(request.localName());
+ } catch (IOException e) {
+ response.setStatus(400);
+ error = true;
+ }
return;
}
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2009-02-04 14:38:37 UTC (rev 921)
+++ trunk/webapps/docs/changelog.xml 2009-02-09 13:37:00 UTC (rev 922)
@@ -58,6 +58,9 @@
</subsection>
<subsection name="Coyote">
<changelog>
+ <fix>
+ HTTP/1.0 handling differed from the old org.apache.jk connector. (remm)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
15 years, 2 months
- 1
- 0
JBossWeb SVN: r921 - in branches/2.1.x: java/org/apache/catalina/servlets and 2 other directories.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2009-02-04 09:38:37 -0500 (Wed, 04 Feb 2009)
New Revision: 921
Modified:
branches/2.1.x/java/org/apache/catalina/authenticator/SSLAuthenticator.java
branches/2.1.x/java/org/apache/catalina/servlets/WebdavServlet.java
branches/2.1.x/java/org/apache/jasper/compiler/Generator.java
branches/2.1.x/webapps/docs/changelog.xml
Log:
- 3 minor Tomcat fixes.
Modified: branches/2.1.x/java/org/apache/catalina/authenticator/SSLAuthenticator.java
===================================================================
--- branches/2.1.x/java/org/apache/catalina/authenticator/SSLAuthenticator.java 2009-02-04 14:37:43 UTC (rev 920)
+++ branches/2.1.x/java/org/apache/catalina/authenticator/SSLAuthenticator.java 2009-02-04 14:38:37 UTC (rev 921)
@@ -140,7 +140,7 @@
if ((certs == null) || (certs.length < 1)) {
if (containerLog.isDebugEnabled())
containerLog.debug(" No certificates included with this request");
- response.sendError(HttpServletResponse.SC_BAD_REQUEST,
+ response.sendError(HttpServletResponse.SC_UNAUTHORIZED,
sm.getString("authenticator.certificates"));
return (false);
}
Modified: branches/2.1.x/java/org/apache/catalina/servlets/WebdavServlet.java
===================================================================
--- branches/2.1.x/java/org/apache/catalina/servlets/WebdavServlet.java 2009-02-04 14:37:43 UTC (rev 920)
+++ branches/2.1.x/java/org/apache/catalina/servlets/WebdavServlet.java 2009-02-04 14:38:37 UTC (rev 921)
@@ -37,6 +37,7 @@
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
import javax.naming.directory.DirContext;
+import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.UnavailableException;
import javax.servlet.http.HttpServletRequest;
@@ -121,7 +122,6 @@
// -------------------------------------------------------------- Constants
- private static final String METHOD_HEAD = "HEAD";
private static final String METHOD_PROPFIND = "PROPFIND";
private static final String METHOD_PROPPATCH = "PROPPATCH";
private static final String METHOD_MKCOL = "MKCOL";
@@ -132,12 +132,6 @@
/**
- * Default depth is infite.
- */
- private static final int INFINITY = 3; // To limit tree browsing a bit
-
-
- /**
* PROPFIND - Specify a property mask.
*/
private static final int FIND_BY_PROPERTY = 0;
@@ -250,6 +244,13 @@
private String secret = "catalina";
+ /**
+ * Default depth in spec is infinite. Limit depth to 3 by default as
+ * infinite depth makes operations very expensive.
+ */
+ private int maxDepth = 3;
+
+
// --------------------------------------------------------- Public Methods
@@ -264,6 +265,10 @@
if (getServletConfig().getInitParameter("secret") != null)
secret = getServletConfig().getInitParameter("secret");
+ if (getServletConfig().getInitParameter("maxDepth") != null)
+ maxDepth = Integer.parseInt(
+ getServletConfig().getInitParameter("maxDepth"));
+
// Load the MD5 helper used to calculate signatures.
try {
md5Helper = MessageDigest.getInstance("MD5");
@@ -289,13 +294,8 @@
documentBuilderFactory.setNamespaceAware(true);
documentBuilderFactory.setExpandEntityReferences(false);
documentBuilder = documentBuilderFactory.newDocumentBuilder();
- documentBuilder.setEntityResolver
- (new EntityResolver() {
- public InputSource resolveEntity(String publicId, String systemId)
- throws SAXException, IOException {
- return new InputSource(new StringReader(""));
- }
- });
+ documentBuilder.setEntityResolver(
+ new WebdavResolver(this.getServletContext()));
} catch(ParserConfigurationException e) {
throw new ServletException
(sm.getString("webdavservlet.jaxpfailed"));
@@ -373,7 +373,6 @@
* @param request The servlet request we are processing
*/
protected String getRelativePath(HttpServletRequest request) {
-
// Are we being processed by a RequestDispatcher.include()?
if (request.getAttribute(Globals.INCLUDE_REQUEST_URI_ATTR) != null) {
String result = (String) request.getAttribute(
@@ -444,21 +443,21 @@
// Properties which are to be displayed.
Vector<String> properties = null;
// Propfind depth
- int depth = INFINITY;
+ int depth = maxDepth;
// Propfind type
int type = FIND_ALL_PROP;
String depthStr = req.getHeader("Depth");
if (depthStr == null) {
- depth = INFINITY;
+ depth = maxDepth;
} else {
if (depthStr.equals("0")) {
depth = 0;
} else if (depthStr.equals("1")) {
depth = 1;
} else if (depthStr.equals("infinity")) {
- depth = INFINITY;
+ depth = maxDepth;
}
}
@@ -536,13 +535,13 @@
int slash = path.lastIndexOf('/');
if (slash != -1) {
String parentPath = path.substring(0, slash);
- Vector currentLockNullResources =
- (Vector) lockNullResources.get(parentPath);
+ Vector<String> currentLockNullResources =
+ lockNullResources.get(parentPath);
if (currentLockNullResources != null) {
- Enumeration lockNullResourcesList =
+ Enumeration<String> lockNullResourcesList =
currentLockNullResources.elements();
while (lockNullResourcesList.hasMoreElements()) {
- String lockNullPath = (String)
+ String lockNullPath =
lockNullResourcesList.nextElement();
if (lockNullPath.equals(path)) {
resp.setStatus(WebdavStatus.SC_MULTI_STATUS);
@@ -598,7 +597,7 @@
while ((!stack.isEmpty()) && (depth >= 0)) {
- String currentPath = (String) stack.pop();
+ String currentPath = stack.pop();
parseProperties(req, generatedXML, currentPath,
type, properties);
@@ -611,10 +610,10 @@
if ((object instanceof DirContext) && (depth > 0)) {
try {
- NamingEnumeration enumeration = resources.list(currentPath);
+ NamingEnumeration<NameClassPair> enumeration =
+ resources.list(currentPath);
while (enumeration.hasMoreElements()) {
- NameClassPair ncPair =
- (NameClassPair) enumeration.nextElement();
+ NameClassPair ncPair = enumeration.nextElement();
String newPath = currentPath;
if (!(newPath.endsWith("/")))
newPath += "/";
@@ -634,13 +633,13 @@
if (lockPath.endsWith("/"))
lockPath =
lockPath.substring(0, lockPath.length() - 1);
- Vector currentLockNullResources =
- (Vector) lockNullResources.get(lockPath);
+ Vector<String> currentLockNullResources =
+ lockNullResources.get(lockPath);
if (currentLockNullResources != null) {
- Enumeration lockNullResourcesList =
+ Enumeration<String> lockNullResourcesList =
currentLockNullResources.elements();
while (lockNullResourcesList.hasMoreElements()) {
- String lockNullPath = (String)
+ String lockNullPath =
lockNullResourcesList.nextElement();
parseLockNullProperties
(req, generatedXML, lockNullPath, type,
@@ -716,9 +715,8 @@
}
boolean exists = true;
- Object object = null;
try {
- object = resources.lookup(path);
+ resources.lookup(path);
} catch (NamingException e) {
exists = false;
}
@@ -739,8 +737,8 @@
if (req.getInputStream().available() > 0) {
DocumentBuilder documentBuilder = getDocumentBuilder();
try {
- Document document = documentBuilder.parse
- (new InputSource(req.getInputStream()));
+ // Document document =
+ documentBuilder.parse(new InputSource(req.getInputStream()));
// TODO : Process this request body
resp.sendError(WebdavStatus.SC_NOT_IMPLEMENTED);
return;
@@ -885,12 +883,12 @@
String depthStr = req.getHeader("Depth");
if (depthStr == null) {
- lock.depth = INFINITY;
+ lock.depth = maxDepth;
} else {
if (depthStr.equals("0")) {
lock.depth = 0;
} else {
- lock.depth = INFINITY;
+ lock.depth = maxDepth;
}
}
@@ -1083,7 +1081,7 @@
exists = false;
}
- Enumeration locksList = null;
+ Enumeration<LockInfo> locksList = null;
if (lockRequestType == LOCK_CREATION) {
@@ -1097,7 +1095,7 @@
md5Encoder.encode(md5Helper.digest(lockTokenStr.getBytes()));
if ( (exists) && (object instanceof DirContext) &&
- (lock.depth == INFINITY) ) {
+ (lock.depth == maxDepth) ) {
// Locking a collection (and all its member resources)
@@ -1106,7 +1104,7 @@
Vector<String> lockPaths = new Vector<String>();
locksList = collectionLocks.elements();
while (locksList.hasMoreElements()) {
- LockInfo currentLock = (LockInfo) locksList.nextElement();
+ LockInfo currentLock = locksList.nextElement();
if (currentLock.hasExpired()) {
resourceLocks.remove(currentLock.path);
continue;
@@ -1120,7 +1118,7 @@
}
locksList = resourceLocks.elements();
while (locksList.hasMoreElements()) {
- LockInfo currentLock = (LockInfo) locksList.nextElement();
+ LockInfo currentLock = locksList.nextElement();
if (currentLock.hasExpired()) {
resourceLocks.remove(currentLock.path);
continue;
@@ -1138,7 +1136,7 @@
// One of the child paths was locked
// We generate a multistatus error report
- Enumeration lockPathsList = lockPaths.elements();
+ Enumeration<String> lockPathsList = lockPaths.elements();
resp.setStatus(WebdavStatus.SC_CONFLICT);
@@ -1155,7 +1153,7 @@
generatedXML.writeElement(null, "href",
XMLWriter.OPENING);
generatedXML
- .writeText((String) lockPathsList.nextElement());
+ .writeText(lockPathsList.nextElement());
generatedXML.writeElement(null, "href",
XMLWriter.CLOSING);
generatedXML.writeElement(null, "status",
@@ -1188,7 +1186,7 @@
locksList = collectionLocks.elements();
while (locksList.hasMoreElements()) {
- LockInfo currentLock = (LockInfo) locksList.nextElement();
+ LockInfo currentLock = locksList.nextElement();
if (currentLock.path.equals(lock.path)) {
if (currentLock.isExclusive()) {
@@ -1219,7 +1217,7 @@
// Locking a single resource
// Retrieving an already existing lock on that resource
- LockInfo presentLock = (LockInfo) resourceLocks.get(lock.path);
+ LockInfo presentLock = resourceLocks.get(lock.path);
if (presentLock != null) {
if ((presentLock.isExclusive()) || (lock.isExclusive())) {
@@ -1278,15 +1276,15 @@
// Checking resource locks
- LockInfo toRenew = (LockInfo) resourceLocks.get(path);
- Enumeration tokenList = null;
+ LockInfo toRenew = resourceLocks.get(path);
+ Enumeration<String> tokenList = null;
if (lock != null) {
// At least one of the tokens of the locks must have been given
tokenList = toRenew.tokens.elements();
while (tokenList.hasMoreElements()) {
- String token = (String) tokenList.nextElement();
+ String token = tokenList.nextElement();
if (ifHeader.indexOf(token) != -1) {
toRenew.expiresAt = lock.expiresAt;
lock = toRenew;
@@ -1297,14 +1295,15 @@
// Checking inheritable collection locks
- Enumeration collectionLocksList = collectionLocks.elements();
+ Enumeration<LockInfo> collectionLocksList =
+ collectionLocks.elements();
while (collectionLocksList.hasMoreElements()) {
- toRenew = (LockInfo) collectionLocksList.nextElement();
+ toRenew = collectionLocksList.nextElement();
if (path.equals(toRenew.path)) {
tokenList = toRenew.tokens.elements();
while (tokenList.hasMoreElements()) {
- String token = (String) tokenList.nextElement();
+ String token = tokenList.nextElement();
if (ifHeader.indexOf(token) != -1) {
toRenew.expiresAt = lock.expiresAt;
lock = toRenew;
@@ -1367,15 +1366,15 @@
// Checking resource locks
- LockInfo lock = (LockInfo) resourceLocks.get(path);
- Enumeration tokenList = null;
+ LockInfo lock = resourceLocks.get(path);
+ Enumeration<String> tokenList = null;
if (lock != null) {
// At least one of the tokens of the locks must have been given
tokenList = lock.tokens.elements();
while (tokenList.hasMoreElements()) {
- String token = (String) tokenList.nextElement();
+ String token = tokenList.nextElement();
if (lockTokenHeader.indexOf(token) != -1) {
lock.tokens.removeElement(token);
}
@@ -1391,14 +1390,14 @@
// Checking inheritable collection locks
- Enumeration collectionLocksList = collectionLocks.elements();
+ Enumeration<LockInfo> collectionLocksList = collectionLocks.elements();
while (collectionLocksList.hasMoreElements()) {
- lock = (LockInfo) collectionLocksList.nextElement();
+ lock = collectionLocksList.nextElement();
if (path.equals(lock.path)) {
tokenList = lock.tokens.elements();
while (tokenList.hasMoreElements()) {
- String token = (String) tokenList.nextElement();
+ String token = tokenList.nextElement();
if (lockTokenHeader.indexOf(token) != -1) {
lock.tokens.removeElement(token);
break;
@@ -1468,8 +1467,8 @@
// Checking resource locks
- LockInfo lock = (LockInfo) resourceLocks.get(path);
- Enumeration tokenList = null;
+ LockInfo lock = resourceLocks.get(path);
+ Enumeration<String> tokenList = null;
if ((lock != null) && (lock.hasExpired())) {
resourceLocks.remove(path);
} else if (lock != null) {
@@ -1479,7 +1478,7 @@
tokenList = lock.tokens.elements();
boolean tokenMatch = false;
while (tokenList.hasMoreElements()) {
- String token = (String) tokenList.nextElement();
+ String token = tokenList.nextElement();
if (ifHeader.indexOf(token) != -1)
tokenMatch = true;
}
@@ -1490,9 +1489,9 @@
// Checking inheritable collection locks
- Enumeration collectionLocksList = collectionLocks.elements();
+ Enumeration<LockInfo> collectionLocksList = collectionLocks.elements();
while (collectionLocksList.hasMoreElements()) {
- lock = (LockInfo) collectionLocksList.nextElement();
+ lock = collectionLocksList.nextElement();
if (lock.hasExpired()) {
collectionLocks.removeElement(lock);
} else if (path.startsWith(lock.path)) {
@@ -1500,7 +1499,7 @@
tokenList = lock.tokens.elements();
boolean tokenMatch = false;
while (tokenList.hasMoreElements()) {
- String token = (String) tokenList.nextElement();
+ String token = tokenList.nextElement();
if (ifHeader.indexOf(token) != -1)
tokenMatch = true;
}
@@ -1671,7 +1670,7 @@
// Copy was successful
resp.setStatus(WebdavStatus.SC_CREATED);
-
+
// Removing any lock-null resource which would be present at
// the destination path
lockNullResources.remove(destinationPath);
@@ -1700,6 +1699,7 @@
try {
object = resources.lookup(source);
} catch (NamingException e) {
+ // Ignore
}
if (object instanceof DirContext) {
@@ -1713,9 +1713,10 @@
}
try {
- NamingEnumeration enumeration = resources.list(source);
+ NamingEnumeration<NameClassPair> enumeration =
+ resources.list(source);
while (enumeration.hasMoreElements()) {
- NameClassPair ncPair = (NameClassPair) enumeration.nextElement();
+ NameClassPair ncPair = enumeration.nextElement();
String childDest = dest;
if (!childDest.equals("/"))
childDest += "/";
@@ -1887,7 +1888,7 @@
if (lockTokenHeader == null)
lockTokenHeader = "";
- Enumeration enumeration = null;
+ Enumeration<NameClassPair> enumeration = null;
try {
enumeration = resources.list(path);
} catch (NamingException e) {
@@ -1897,7 +1898,7 @@
}
while (enumeration.hasMoreElements()) {
- NameClassPair ncPair = (NameClassPair) enumeration.nextElement();
+ NameClassPair ncPair = enumeration.nextElement();
String childName = path;
if (!childName.equals("/"))
childName += "/";
@@ -1947,7 +1948,7 @@
* @param errorList List of error to be displayed
*/
private void sendReport(HttpServletRequest req, HttpServletResponse resp,
- Hashtable errorList)
+ Hashtable<String,Integer> errorList)
throws ServletException, IOException {
resp.setStatus(WebdavStatus.SC_MULTI_STATUS);
@@ -1962,11 +1963,11 @@
+ generateNamespaceDeclarations(),
XMLWriter.OPENING);
- Enumeration pathList = errorList.keys();
+ Enumeration<String> pathList = errorList.keys();
while (pathList.hasMoreElements()) {
- String errorPath = (String) pathList.nextElement();
- int errorCode = ((Integer) errorList.get(errorPath)).intValue();
+ String errorPath = pathList.nextElement();
+ int errorCode = errorList.get(errorPath).intValue();
generatedXML.writeElement(null, "response", XMLWriter.OPENING);
@@ -2071,7 +2072,7 @@
contentType);
}
generatedXML.writeProperty(null, "getetag",
- cacheEntry.attributes.getETag());
+ cacheEntry.attributes.getETag());
generatedXML.writeElement(null, "resourcetype",
XMLWriter.NO_CONTENT);
} else {
@@ -2156,7 +2157,7 @@
while (properties.hasMoreElements()) {
- String property = (String) properties.nextElement();
+ String property = properties.nextElement();
if (property.equals("creationdate")) {
generatedXML.writeProperty
@@ -2249,7 +2250,8 @@
generatedXML.writeElement(null, "status", XMLWriter.CLOSING);
generatedXML.writeElement(null, "propstat", XMLWriter.CLOSING);
- Enumeration propertiesNotFoundList = propertiesNotFound.elements();
+ Enumeration<String> propertiesNotFoundList =
+ propertiesNotFound.elements();
if (propertiesNotFoundList.hasMoreElements()) {
@@ -2262,7 +2264,7 @@
while (propertiesNotFoundList.hasMoreElements()) {
generatedXML.writeElement
- (null, (String) propertiesNotFoundList.nextElement(),
+ (null, propertiesNotFoundList.nextElement(),
XMLWriter.NO_CONTENT);
}
@@ -2296,7 +2298,7 @@
private void parseLockNullProperties(HttpServletRequest req,
XMLWriter generatedXML,
String path, int type,
- Vector propertiesVector) {
+ Vector<String> propertiesVector) {
// Exclude any resource in the /WEB-INF and /META-INF subdirectories
// (the "toUpperCase()" avoids problems on Windows systems)
@@ -2305,7 +2307,7 @@
return;
// Retrieving the lock associated with the lock-null resource
- LockInfo lock = (LockInfo) resourceLocks.get(path);
+ LockInfo lock = resourceLocks.get(path);
if (lock == null)
return;
@@ -2324,7 +2326,8 @@
if (!toAppend.startsWith("/"))
toAppend = "/" + toAppend;
- generatedXML.writeText(rewriteUrl(RequestUtil.normalize(absoluteUri + toAppend)));
+ generatedXML.writeText(rewriteUrl(RequestUtil.normalize(
+ absoluteUri + toAppend)));
generatedXML.writeElement(null, "href", XMLWriter.CLOSING);
@@ -2429,11 +2432,11 @@
generatedXML.writeElement(null, "propstat", XMLWriter.OPENING);
generatedXML.writeElement(null, "prop", XMLWriter.OPENING);
- Enumeration properties = propertiesVector.elements();
+ Enumeration<String> properties = propertiesVector.elements();
while (properties.hasMoreElements()) {
- String property = (String) properties.nextElement();
+ String property = properties.nextElement();
if (property.equals("creationdate")) {
generatedXML.writeProperty
@@ -2498,7 +2501,7 @@
generatedXML.writeElement(null, "status", XMLWriter.CLOSING);
generatedXML.writeElement(null, "propstat", XMLWriter.CLOSING);
- Enumeration propertiesNotFoundList = propertiesNotFound.elements();
+ Enumeration<String> propertiesNotFoundList = propertiesNotFound.elements();
if (propertiesNotFoundList.hasMoreElements()) {
@@ -2511,7 +2514,7 @@
while (propertiesNotFoundList.hasMoreElements()) {
generatedXML.writeElement
- (null, (String) propertiesNotFoundList.nextElement(),
+ (null, propertiesNotFoundList.nextElement(),
XMLWriter.NO_CONTENT);
}
@@ -2542,8 +2545,8 @@
private boolean generateLockDiscovery
(String path, XMLWriter generatedXML) {
- LockInfo resourceLock = (LockInfo) resourceLocks.get(path);
- Enumeration collectionLocksList = collectionLocks.elements();
+ LockInfo resourceLock = resourceLocks.get(path);
+ Enumeration<LockInfo> collectionLocksList = collectionLocks.elements();
boolean wroteStart = false;
@@ -2555,8 +2558,7 @@
}
while (collectionLocksList.hasMoreElements()) {
- LockInfo currentLock =
- (LockInfo) collectionLocksList.nextElement();
+ LockInfo currentLock = collectionLocksList.nextElement();
if (path.startsWith(currentLock.path)) {
if (!wroteStart) {
wroteStart = true;
@@ -2659,7 +2661,7 @@
* Constructor.
*/
public LockInfo() {
-
+ // Ignore
}
@@ -2690,7 +2692,7 @@
result += "Owner:" + owner + "\n";
result += "Expiration:"
+ FastHttpDateFormat.formatDate(expiresAt, null) + "\n";
- Enumeration tokensList = tokens.elements();
+ Enumeration<String> tokensList = tokens.elements();
while (tokensList.hasMoreElements()) {
result += "Token:" + tokensList.nextElement() + "\n";
}
@@ -2734,7 +2736,7 @@
generatedXML.writeElement(null, "lockscope", XMLWriter.CLOSING);
generatedXML.writeElement(null, "depth", XMLWriter.OPENING);
- if (depth == INFINITY) {
+ if (depth == maxDepth) {
generatedXML.writeText("Infinity");
} else {
generatedXML.writeText("0");
@@ -2751,7 +2753,7 @@
generatedXML.writeElement(null, "timeout", XMLWriter.CLOSING);
generatedXML.writeElement(null, "locktoken", XMLWriter.OPENING);
- Enumeration tokensList = tokens.elements();
+ Enumeration<String> tokensList = tokens.elements();
while (tokensList.hasMoreElements()) {
generatedXML.writeElement(null, "href", XMLWriter.OPENING);
generatedXML.writeText("opaquelocktoken:"
@@ -2768,7 +2770,27 @@
}
-};
+ // --------------------------------------------- WebdavResolver Inner Class
+ /**
+ * Work around for XML parsers that don't fully respect
+ * {@link DocumentBuilderFactory#setExpandEntityReferences(false)}. External
+ * references are filtered out for security reasons. See CVE-2007-5461.
+ */
+ private class WebdavResolver implements EntityResolver {
+ private ServletContext context;
+
+ public WebdavResolver(ServletContext theContext) {
+ context = theContext;
+ }
+
+ public InputSource resolveEntity (String publicId, String systemId) {
+ context.log(sm.getString("webdavservlet.enternalEntityIgnored",
+ publicId, systemId));
+ return new InputSource(
+ new StringReader("Ignored external entity"));
+ }
+ }
+}
// -------------------------------------------------------- WebdavStatus Class
@@ -3069,7 +3091,7 @@
if (!mapStatusCodes.containsKey(intKey)) {
return "";
} else {
- return (String) mapStatusCodes.get(intKey);
+ return mapStatusCodes.get(intKey);
}
}
@@ -3088,5 +3110,6 @@
mapStatusCodes.put(new Integer(nKey), strVal);
}
-};
+}
+
Modified: branches/2.1.x/java/org/apache/jasper/compiler/Generator.java
===================================================================
--- branches/2.1.x/java/org/apache/jasper/compiler/Generator.java 2009-02-04 14:37:43 UTC (rev 920)
+++ branches/2.1.x/java/org/apache/jasper/compiler/Generator.java 2009-02-04 14:38:37 UTC (rev 921)
@@ -27,8 +27,8 @@
import java.util.Arrays;
import java.util.Collections;
import java.util.Enumeration;
+import java.util.HashMap;
import java.util.Hashtable;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Vector;
@@ -43,6 +43,7 @@
import org.apache.jasper.Constants;
import org.apache.jasper.JasperException;
import org.apache.jasper.JspCompilationContext;
+import org.apache.jasper.compiler.Node.NamedAttribute;
import org.apache.jasper.runtime.JspRuntimeLibrary;
import org.xml.sax.Attributes;
@@ -267,8 +268,8 @@
if (!n.implementsSimpleTag()) {
String name = createTagHandlerPoolName(n.getPrefix(), n
- .getLocalName(), n.getAttributes(), n
- .hasEmptyBody());
+ .getLocalName(), n.getAttributes(),
+ n.getNamedAttributeNodes(), n.hasEmptyBody());
n.setTagHandlerPoolName(name);
if (!names.contains(name)) {
names.add(name);
@@ -284,15 +285,21 @@
* @return The name of the tag handler pool
*/
private String createTagHandlerPoolName(String prefix,
- String shortName, Attributes attrs, boolean hasEmptyBody) {
+ String shortName, Attributes attrs, Node.Nodes namedAttrs,
+ boolean hasEmptyBody) {
String poolName = null;
poolName = "_jspx_tagPool_" + prefix + "_" + shortName;
if (attrs != null) {
- String[] attrNames = new String[attrs.getLength()];
+ String[] attrNames =
+ new String[attrs.getLength() + namedAttrs.size()];
for (int i = 0; i < attrNames.length; i++) {
attrNames[i] = attrs.getQName(i);
}
+ for (int i = 0; i < namedAttrs.size(); i++) {
+ attrNames[attrs.getLength() + i] =
+ ((NamedAttribute) namedAttrs.getNode(i)).getQName();
+ }
Arrays.sort(attrNames, Collections.reverseOrder());
if (attrNames.length > 0) {
poolName = poolName + "&";
Modified: branches/2.1.x/webapps/docs/changelog.xml
===================================================================
--- branches/2.1.x/webapps/docs/changelog.xml 2009-02-04 14:37:43 UTC (rev 920)
+++ branches/2.1.x/webapps/docs/changelog.xml 2009-02-04 14:38:37 UTC (rev 921)
@@ -23,6 +23,13 @@
</subsection>
<subsection name="Catalina">
<changelog>
+ <fix>
+ <bug>38553</bug>: A lack of certs is normal if the user doesn't have a trusted cert. Return 401,
+ not 400 in this case. (markt)
+ </fix>
+ <fix>
+ <bug>46606</bug>: Max depth limit configurable in WebDAV Servlet. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
@@ -37,6 +44,9 @@
<fix>
Validator code cleanup. (markt)
</fix>
+ <fix>
+ <bug>38197</bug>: Take account of jsp:attribute elements when naming tag pools. (markt)
+ </fix>
</changelog>
</subsection>
</section>
15 years, 3 months
- 1
- 0
JBossWeb SVN: r920 - in trunk: java/org/apache/catalina/servlets and 2 other directories.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2009-02-04 09:37:43 -0500 (Wed, 04 Feb 2009)
New Revision: 920
Modified:
trunk/java/org/apache/catalina/authenticator/SSLAuthenticator.java
trunk/java/org/apache/catalina/servlets/WebdavServlet.java
trunk/java/org/apache/jasper/compiler/Generator.java
trunk/webapps/docs/changelog.xml
Log:
- 3 minor Tomcat fixes.
Modified: trunk/java/org/apache/catalina/authenticator/SSLAuthenticator.java
===================================================================
--- trunk/java/org/apache/catalina/authenticator/SSLAuthenticator.java 2009-02-04 14:26:24 UTC (rev 919)
+++ trunk/java/org/apache/catalina/authenticator/SSLAuthenticator.java 2009-02-04 14:37:43 UTC (rev 920)
@@ -140,7 +140,7 @@
if ((certs == null) || (certs.length < 1)) {
if (containerLog.isDebugEnabled())
containerLog.debug(" No certificates included with this request");
- response.sendError(HttpServletResponse.SC_BAD_REQUEST,
+ response.sendError(HttpServletResponse.SC_UNAUTHORIZED,
sm.getString("authenticator.certificates"));
return (false);
}
Modified: trunk/java/org/apache/catalina/servlets/WebdavServlet.java
===================================================================
--- trunk/java/org/apache/catalina/servlets/WebdavServlet.java 2009-02-04 14:26:24 UTC (rev 919)
+++ trunk/java/org/apache/catalina/servlets/WebdavServlet.java 2009-02-04 14:37:43 UTC (rev 920)
@@ -37,6 +37,7 @@
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
import javax.naming.directory.DirContext;
+import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.UnavailableException;
import javax.servlet.http.HttpServletRequest;
@@ -121,7 +122,6 @@
// -------------------------------------------------------------- Constants
- private static final String METHOD_HEAD = "HEAD";
private static final String METHOD_PROPFIND = "PROPFIND";
private static final String METHOD_PROPPATCH = "PROPPATCH";
private static final String METHOD_MKCOL = "MKCOL";
@@ -132,12 +132,6 @@
/**
- * Default depth is infite.
- */
- private static final int INFINITY = 3; // To limit tree browsing a bit
-
-
- /**
* PROPFIND - Specify a property mask.
*/
private static final int FIND_BY_PROPERTY = 0;
@@ -250,6 +244,13 @@
private String secret = "catalina";
+ /**
+ * Default depth in spec is infinite. Limit depth to 3 by default as
+ * infinite depth makes operations very expensive.
+ */
+ private int maxDepth = 3;
+
+
// --------------------------------------------------------- Public Methods
@@ -264,6 +265,10 @@
if (getServletConfig().getInitParameter("secret") != null)
secret = getServletConfig().getInitParameter("secret");
+ if (getServletConfig().getInitParameter("maxDepth") != null)
+ maxDepth = Integer.parseInt(
+ getServletConfig().getInitParameter("maxDepth"));
+
// Load the MD5 helper used to calculate signatures.
try {
md5Helper = MessageDigest.getInstance("MD5");
@@ -289,13 +294,8 @@
documentBuilderFactory.setNamespaceAware(true);
documentBuilderFactory.setExpandEntityReferences(false);
documentBuilder = documentBuilderFactory.newDocumentBuilder();
- documentBuilder.setEntityResolver
- (new EntityResolver() {
- public InputSource resolveEntity(String publicId, String systemId)
- throws SAXException, IOException {
- return new InputSource(new StringReader(""));
- }
- });
+ documentBuilder.setEntityResolver(
+ new WebdavResolver(this.getServletContext()));
} catch(ParserConfigurationException e) {
throw new ServletException
(sm.getString("webdavservlet.jaxpfailed"));
@@ -373,7 +373,6 @@
* @param request The servlet request we are processing
*/
protected String getRelativePath(HttpServletRequest request) {
-
// Are we being processed by a RequestDispatcher.include()?
if (request.getAttribute(Globals.INCLUDE_REQUEST_URI_ATTR) != null) {
String result = (String) request.getAttribute(
@@ -444,21 +443,21 @@
// Properties which are to be displayed.
Vector<String> properties = null;
// Propfind depth
- int depth = INFINITY;
+ int depth = maxDepth;
// Propfind type
int type = FIND_ALL_PROP;
String depthStr = req.getHeader("Depth");
if (depthStr == null) {
- depth = INFINITY;
+ depth = maxDepth;
} else {
if (depthStr.equals("0")) {
depth = 0;
} else if (depthStr.equals("1")) {
depth = 1;
} else if (depthStr.equals("infinity")) {
- depth = INFINITY;
+ depth = maxDepth;
}
}
@@ -536,13 +535,13 @@
int slash = path.lastIndexOf('/');
if (slash != -1) {
String parentPath = path.substring(0, slash);
- Vector currentLockNullResources =
- (Vector) lockNullResources.get(parentPath);
+ Vector<String> currentLockNullResources =
+ lockNullResources.get(parentPath);
if (currentLockNullResources != null) {
- Enumeration lockNullResourcesList =
+ Enumeration<String> lockNullResourcesList =
currentLockNullResources.elements();
while (lockNullResourcesList.hasMoreElements()) {
- String lockNullPath = (String)
+ String lockNullPath =
lockNullResourcesList.nextElement();
if (lockNullPath.equals(path)) {
resp.setStatus(WebdavStatus.SC_MULTI_STATUS);
@@ -598,7 +597,7 @@
while ((!stack.isEmpty()) && (depth >= 0)) {
- String currentPath = (String) stack.pop();
+ String currentPath = stack.pop();
parseProperties(req, generatedXML, currentPath,
type, properties);
@@ -611,10 +610,10 @@
if ((object instanceof DirContext) && (depth > 0)) {
try {
- NamingEnumeration enumeration = resources.list(currentPath);
+ NamingEnumeration<NameClassPair> enumeration =
+ resources.list(currentPath);
while (enumeration.hasMoreElements()) {
- NameClassPair ncPair =
- (NameClassPair) enumeration.nextElement();
+ NameClassPair ncPair = enumeration.nextElement();
String newPath = currentPath;
if (!(newPath.endsWith("/")))
newPath += "/";
@@ -634,13 +633,13 @@
if (lockPath.endsWith("/"))
lockPath =
lockPath.substring(0, lockPath.length() - 1);
- Vector currentLockNullResources =
- (Vector) lockNullResources.get(lockPath);
+ Vector<String> currentLockNullResources =
+ lockNullResources.get(lockPath);
if (currentLockNullResources != null) {
- Enumeration lockNullResourcesList =
+ Enumeration<String> lockNullResourcesList =
currentLockNullResources.elements();
while (lockNullResourcesList.hasMoreElements()) {
- String lockNullPath = (String)
+ String lockNullPath =
lockNullResourcesList.nextElement();
parseLockNullProperties
(req, generatedXML, lockNullPath, type,
@@ -716,9 +715,8 @@
}
boolean exists = true;
- Object object = null;
try {
- object = resources.lookup(path);
+ resources.lookup(path);
} catch (NamingException e) {
exists = false;
}
@@ -739,8 +737,8 @@
if (req.getInputStream().available() > 0) {
DocumentBuilder documentBuilder = getDocumentBuilder();
try {
- Document document = documentBuilder.parse
- (new InputSource(req.getInputStream()));
+ // Document document =
+ documentBuilder.parse(new InputSource(req.getInputStream()));
// TODO : Process this request body
resp.sendError(WebdavStatus.SC_NOT_IMPLEMENTED);
return;
@@ -885,12 +883,12 @@
String depthStr = req.getHeader("Depth");
if (depthStr == null) {
- lock.depth = INFINITY;
+ lock.depth = maxDepth;
} else {
if (depthStr.equals("0")) {
lock.depth = 0;
} else {
- lock.depth = INFINITY;
+ lock.depth = maxDepth;
}
}
@@ -1083,7 +1081,7 @@
exists = false;
}
- Enumeration locksList = null;
+ Enumeration<LockInfo> locksList = null;
if (lockRequestType == LOCK_CREATION) {
@@ -1097,7 +1095,7 @@
md5Encoder.encode(md5Helper.digest(lockTokenStr.getBytes()));
if ( (exists) && (object instanceof DirContext) &&
- (lock.depth == INFINITY) ) {
+ (lock.depth == maxDepth) ) {
// Locking a collection (and all its member resources)
@@ -1106,7 +1104,7 @@
Vector<String> lockPaths = new Vector<String>();
locksList = collectionLocks.elements();
while (locksList.hasMoreElements()) {
- LockInfo currentLock = (LockInfo) locksList.nextElement();
+ LockInfo currentLock = locksList.nextElement();
if (currentLock.hasExpired()) {
resourceLocks.remove(currentLock.path);
continue;
@@ -1120,7 +1118,7 @@
}
locksList = resourceLocks.elements();
while (locksList.hasMoreElements()) {
- LockInfo currentLock = (LockInfo) locksList.nextElement();
+ LockInfo currentLock = locksList.nextElement();
if (currentLock.hasExpired()) {
resourceLocks.remove(currentLock.path);
continue;
@@ -1138,7 +1136,7 @@
// One of the child paths was locked
// We generate a multistatus error report
- Enumeration lockPathsList = lockPaths.elements();
+ Enumeration<String> lockPathsList = lockPaths.elements();
resp.setStatus(WebdavStatus.SC_CONFLICT);
@@ -1155,7 +1153,7 @@
generatedXML.writeElement(null, "href",
XMLWriter.OPENING);
generatedXML
- .writeText((String) lockPathsList.nextElement());
+ .writeText(lockPathsList.nextElement());
generatedXML.writeElement(null, "href",
XMLWriter.CLOSING);
generatedXML.writeElement(null, "status",
@@ -1188,7 +1186,7 @@
locksList = collectionLocks.elements();
while (locksList.hasMoreElements()) {
- LockInfo currentLock = (LockInfo) locksList.nextElement();
+ LockInfo currentLock = locksList.nextElement();
if (currentLock.path.equals(lock.path)) {
if (currentLock.isExclusive()) {
@@ -1219,7 +1217,7 @@
// Locking a single resource
// Retrieving an already existing lock on that resource
- LockInfo presentLock = (LockInfo) resourceLocks.get(lock.path);
+ LockInfo presentLock = resourceLocks.get(lock.path);
if (presentLock != null) {
if ((presentLock.isExclusive()) || (lock.isExclusive())) {
@@ -1278,15 +1276,15 @@
// Checking resource locks
- LockInfo toRenew = (LockInfo) resourceLocks.get(path);
- Enumeration tokenList = null;
+ LockInfo toRenew = resourceLocks.get(path);
+ Enumeration<String> tokenList = null;
if (lock != null) {
// At least one of the tokens of the locks must have been given
tokenList = toRenew.tokens.elements();
while (tokenList.hasMoreElements()) {
- String token = (String) tokenList.nextElement();
+ String token = tokenList.nextElement();
if (ifHeader.indexOf(token) != -1) {
toRenew.expiresAt = lock.expiresAt;
lock = toRenew;
@@ -1297,14 +1295,15 @@
// Checking inheritable collection locks
- Enumeration collectionLocksList = collectionLocks.elements();
+ Enumeration<LockInfo> collectionLocksList =
+ collectionLocks.elements();
while (collectionLocksList.hasMoreElements()) {
- toRenew = (LockInfo) collectionLocksList.nextElement();
+ toRenew = collectionLocksList.nextElement();
if (path.equals(toRenew.path)) {
tokenList = toRenew.tokens.elements();
while (tokenList.hasMoreElements()) {
- String token = (String) tokenList.nextElement();
+ String token = tokenList.nextElement();
if (ifHeader.indexOf(token) != -1) {
toRenew.expiresAt = lock.expiresAt;
lock = toRenew;
@@ -1367,15 +1366,15 @@
// Checking resource locks
- LockInfo lock = (LockInfo) resourceLocks.get(path);
- Enumeration tokenList = null;
+ LockInfo lock = resourceLocks.get(path);
+ Enumeration<String> tokenList = null;
if (lock != null) {
// At least one of the tokens of the locks must have been given
tokenList = lock.tokens.elements();
while (tokenList.hasMoreElements()) {
- String token = (String) tokenList.nextElement();
+ String token = tokenList.nextElement();
if (lockTokenHeader.indexOf(token) != -1) {
lock.tokens.removeElement(token);
}
@@ -1391,14 +1390,14 @@
// Checking inheritable collection locks
- Enumeration collectionLocksList = collectionLocks.elements();
+ Enumeration<LockInfo> collectionLocksList = collectionLocks.elements();
while (collectionLocksList.hasMoreElements()) {
- lock = (LockInfo) collectionLocksList.nextElement();
+ lock = collectionLocksList.nextElement();
if (path.equals(lock.path)) {
tokenList = lock.tokens.elements();
while (tokenList.hasMoreElements()) {
- String token = (String) tokenList.nextElement();
+ String token = tokenList.nextElement();
if (lockTokenHeader.indexOf(token) != -1) {
lock.tokens.removeElement(token);
break;
@@ -1468,8 +1467,8 @@
// Checking resource locks
- LockInfo lock = (LockInfo) resourceLocks.get(path);
- Enumeration tokenList = null;
+ LockInfo lock = resourceLocks.get(path);
+ Enumeration<String> tokenList = null;
if ((lock != null) && (lock.hasExpired())) {
resourceLocks.remove(path);
} else if (lock != null) {
@@ -1479,7 +1478,7 @@
tokenList = lock.tokens.elements();
boolean tokenMatch = false;
while (tokenList.hasMoreElements()) {
- String token = (String) tokenList.nextElement();
+ String token = tokenList.nextElement();
if (ifHeader.indexOf(token) != -1)
tokenMatch = true;
}
@@ -1490,9 +1489,9 @@
// Checking inheritable collection locks
- Enumeration collectionLocksList = collectionLocks.elements();
+ Enumeration<LockInfo> collectionLocksList = collectionLocks.elements();
while (collectionLocksList.hasMoreElements()) {
- lock = (LockInfo) collectionLocksList.nextElement();
+ lock = collectionLocksList.nextElement();
if (lock.hasExpired()) {
collectionLocks.removeElement(lock);
} else if (path.startsWith(lock.path)) {
@@ -1500,7 +1499,7 @@
tokenList = lock.tokens.elements();
boolean tokenMatch = false;
while (tokenList.hasMoreElements()) {
- String token = (String) tokenList.nextElement();
+ String token = tokenList.nextElement();
if (ifHeader.indexOf(token) != -1)
tokenMatch = true;
}
@@ -1671,7 +1670,7 @@
// Copy was successful
resp.setStatus(WebdavStatus.SC_CREATED);
-
+
// Removing any lock-null resource which would be present at
// the destination path
lockNullResources.remove(destinationPath);
@@ -1700,6 +1699,7 @@
try {
object = resources.lookup(source);
} catch (NamingException e) {
+ // Ignore
}
if (object instanceof DirContext) {
@@ -1713,9 +1713,10 @@
}
try {
- NamingEnumeration enumeration = resources.list(source);
+ NamingEnumeration<NameClassPair> enumeration =
+ resources.list(source);
while (enumeration.hasMoreElements()) {
- NameClassPair ncPair = (NameClassPair) enumeration.nextElement();
+ NameClassPair ncPair = enumeration.nextElement();
String childDest = dest;
if (!childDest.equals("/"))
childDest += "/";
@@ -1887,7 +1888,7 @@
if (lockTokenHeader == null)
lockTokenHeader = "";
- Enumeration enumeration = null;
+ Enumeration<NameClassPair> enumeration = null;
try {
enumeration = resources.list(path);
} catch (NamingException e) {
@@ -1897,7 +1898,7 @@
}
while (enumeration.hasMoreElements()) {
- NameClassPair ncPair = (NameClassPair) enumeration.nextElement();
+ NameClassPair ncPair = enumeration.nextElement();
String childName = path;
if (!childName.equals("/"))
childName += "/";
@@ -1947,7 +1948,7 @@
* @param errorList List of error to be displayed
*/
private void sendReport(HttpServletRequest req, HttpServletResponse resp,
- Hashtable errorList)
+ Hashtable<String,Integer> errorList)
throws ServletException, IOException {
resp.setStatus(WebdavStatus.SC_MULTI_STATUS);
@@ -1962,11 +1963,11 @@
+ generateNamespaceDeclarations(),
XMLWriter.OPENING);
- Enumeration pathList = errorList.keys();
+ Enumeration<String> pathList = errorList.keys();
while (pathList.hasMoreElements()) {
- String errorPath = (String) pathList.nextElement();
- int errorCode = ((Integer) errorList.get(errorPath)).intValue();
+ String errorPath = pathList.nextElement();
+ int errorCode = errorList.get(errorPath).intValue();
generatedXML.writeElement(null, "response", XMLWriter.OPENING);
@@ -2071,7 +2072,7 @@
contentType);
}
generatedXML.writeProperty(null, "getetag",
- cacheEntry.attributes.getETag());
+ cacheEntry.attributes.getETag());
generatedXML.writeElement(null, "resourcetype",
XMLWriter.NO_CONTENT);
} else {
@@ -2156,7 +2157,7 @@
while (properties.hasMoreElements()) {
- String property = (String) properties.nextElement();
+ String property = properties.nextElement();
if (property.equals("creationdate")) {
generatedXML.writeProperty
@@ -2249,7 +2250,8 @@
generatedXML.writeElement(null, "status", XMLWriter.CLOSING);
generatedXML.writeElement(null, "propstat", XMLWriter.CLOSING);
- Enumeration propertiesNotFoundList = propertiesNotFound.elements();
+ Enumeration<String> propertiesNotFoundList =
+ propertiesNotFound.elements();
if (propertiesNotFoundList.hasMoreElements()) {
@@ -2262,7 +2264,7 @@
while (propertiesNotFoundList.hasMoreElements()) {
generatedXML.writeElement
- (null, (String) propertiesNotFoundList.nextElement(),
+ (null, propertiesNotFoundList.nextElement(),
XMLWriter.NO_CONTENT);
}
@@ -2296,7 +2298,7 @@
private void parseLockNullProperties(HttpServletRequest req,
XMLWriter generatedXML,
String path, int type,
- Vector propertiesVector) {
+ Vector<String> propertiesVector) {
// Exclude any resource in the /WEB-INF and /META-INF subdirectories
// (the "toUpperCase()" avoids problems on Windows systems)
@@ -2305,7 +2307,7 @@
return;
// Retrieving the lock associated with the lock-null resource
- LockInfo lock = (LockInfo) resourceLocks.get(path);
+ LockInfo lock = resourceLocks.get(path);
if (lock == null)
return;
@@ -2324,7 +2326,8 @@
if (!toAppend.startsWith("/"))
toAppend = "/" + toAppend;
- generatedXML.writeText(rewriteUrl(RequestUtil.normalize(absoluteUri + toAppend)));
+ generatedXML.writeText(rewriteUrl(RequestUtil.normalize(
+ absoluteUri + toAppend)));
generatedXML.writeElement(null, "href", XMLWriter.CLOSING);
@@ -2429,11 +2432,11 @@
generatedXML.writeElement(null, "propstat", XMLWriter.OPENING);
generatedXML.writeElement(null, "prop", XMLWriter.OPENING);
- Enumeration properties = propertiesVector.elements();
+ Enumeration<String> properties = propertiesVector.elements();
while (properties.hasMoreElements()) {
- String property = (String) properties.nextElement();
+ String property = properties.nextElement();
if (property.equals("creationdate")) {
generatedXML.writeProperty
@@ -2498,7 +2501,7 @@
generatedXML.writeElement(null, "status", XMLWriter.CLOSING);
generatedXML.writeElement(null, "propstat", XMLWriter.CLOSING);
- Enumeration propertiesNotFoundList = propertiesNotFound.elements();
+ Enumeration<String> propertiesNotFoundList = propertiesNotFound.elements();
if (propertiesNotFoundList.hasMoreElements()) {
@@ -2511,7 +2514,7 @@
while (propertiesNotFoundList.hasMoreElements()) {
generatedXML.writeElement
- (null, (String) propertiesNotFoundList.nextElement(),
+ (null, propertiesNotFoundList.nextElement(),
XMLWriter.NO_CONTENT);
}
@@ -2542,8 +2545,8 @@
private boolean generateLockDiscovery
(String path, XMLWriter generatedXML) {
- LockInfo resourceLock = (LockInfo) resourceLocks.get(path);
- Enumeration collectionLocksList = collectionLocks.elements();
+ LockInfo resourceLock = resourceLocks.get(path);
+ Enumeration<LockInfo> collectionLocksList = collectionLocks.elements();
boolean wroteStart = false;
@@ -2555,8 +2558,7 @@
}
while (collectionLocksList.hasMoreElements()) {
- LockInfo currentLock =
- (LockInfo) collectionLocksList.nextElement();
+ LockInfo currentLock = collectionLocksList.nextElement();
if (path.startsWith(currentLock.path)) {
if (!wroteStart) {
wroteStart = true;
@@ -2659,7 +2661,7 @@
* Constructor.
*/
public LockInfo() {
-
+ // Ignore
}
@@ -2690,7 +2692,7 @@
result += "Owner:" + owner + "\n";
result += "Expiration:"
+ FastHttpDateFormat.formatDate(expiresAt, null) + "\n";
- Enumeration tokensList = tokens.elements();
+ Enumeration<String> tokensList = tokens.elements();
while (tokensList.hasMoreElements()) {
result += "Token:" + tokensList.nextElement() + "\n";
}
@@ -2734,7 +2736,7 @@
generatedXML.writeElement(null, "lockscope", XMLWriter.CLOSING);
generatedXML.writeElement(null, "depth", XMLWriter.OPENING);
- if (depth == INFINITY) {
+ if (depth == maxDepth) {
generatedXML.writeText("Infinity");
} else {
generatedXML.writeText("0");
@@ -2751,7 +2753,7 @@
generatedXML.writeElement(null, "timeout", XMLWriter.CLOSING);
generatedXML.writeElement(null, "locktoken", XMLWriter.OPENING);
- Enumeration tokensList = tokens.elements();
+ Enumeration<String> tokensList = tokens.elements();
while (tokensList.hasMoreElements()) {
generatedXML.writeElement(null, "href", XMLWriter.OPENING);
generatedXML.writeText("opaquelocktoken:"
@@ -2768,7 +2770,27 @@
}
-};
+ // --------------------------------------------- WebdavResolver Inner Class
+ /**
+ * Work around for XML parsers that don't fully respect
+ * {@link DocumentBuilderFactory#setExpandEntityReferences(false)}. External
+ * references are filtered out for security reasons. See CVE-2007-5461.
+ */
+ private class WebdavResolver implements EntityResolver {
+ private ServletContext context;
+
+ public WebdavResolver(ServletContext theContext) {
+ context = theContext;
+ }
+
+ public InputSource resolveEntity (String publicId, String systemId) {
+ context.log(sm.getString("webdavservlet.enternalEntityIgnored",
+ publicId, systemId));
+ return new InputSource(
+ new StringReader("Ignored external entity"));
+ }
+ }
+}
// -------------------------------------------------------- WebdavStatus Class
@@ -3069,7 +3091,7 @@
if (!mapStatusCodes.containsKey(intKey)) {
return "";
} else {
- return (String) mapStatusCodes.get(intKey);
+ return mapStatusCodes.get(intKey);
}
}
@@ -3088,5 +3110,6 @@
mapStatusCodes.put(new Integer(nKey), strVal);
}
-};
+}
+
Modified: trunk/java/org/apache/jasper/compiler/Generator.java
===================================================================
--- trunk/java/org/apache/jasper/compiler/Generator.java 2009-02-04 14:26:24 UTC (rev 919)
+++ trunk/java/org/apache/jasper/compiler/Generator.java 2009-02-04 14:37:43 UTC (rev 920)
@@ -27,8 +27,8 @@
import java.util.Arrays;
import java.util.Collections;
import java.util.Enumeration;
+import java.util.HashMap;
import java.util.Hashtable;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Vector;
@@ -43,6 +43,7 @@
import org.apache.jasper.Constants;
import org.apache.jasper.JasperException;
import org.apache.jasper.JspCompilationContext;
+import org.apache.jasper.compiler.Node.NamedAttribute;
import org.apache.jasper.runtime.JspRuntimeLibrary;
import org.xml.sax.Attributes;
@@ -267,8 +268,8 @@
if (!n.implementsSimpleTag()) {
String name = createTagHandlerPoolName(n.getPrefix(), n
- .getLocalName(), n.getAttributes(), n
- .hasEmptyBody());
+ .getLocalName(), n.getAttributes(),
+ n.getNamedAttributeNodes(), n.hasEmptyBody());
n.setTagHandlerPoolName(name);
if (!names.contains(name)) {
names.add(name);
@@ -284,15 +285,21 @@
* @return The name of the tag handler pool
*/
private String createTagHandlerPoolName(String prefix,
- String shortName, Attributes attrs, boolean hasEmptyBody) {
+ String shortName, Attributes attrs, Node.Nodes namedAttrs,
+ boolean hasEmptyBody) {
String poolName = null;
poolName = "_jspx_tagPool_" + prefix + "_" + shortName;
if (attrs != null) {
- String[] attrNames = new String[attrs.getLength()];
+ String[] attrNames =
+ new String[attrs.getLength() + namedAttrs.size()];
for (int i = 0; i < attrNames.length; i++) {
attrNames[i] = attrs.getQName(i);
}
+ for (int i = 0; i < namedAttrs.size(); i++) {
+ attrNames[attrs.getLength() + i] =
+ ((NamedAttribute) namedAttrs.getNode(i)).getQName();
+ }
Arrays.sort(attrNames, Collections.reverseOrder());
if (attrNames.length > 0) {
poolName = poolName + "&";
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2009-02-04 14:26:24 UTC (rev 919)
+++ trunk/webapps/docs/changelog.xml 2009-02-04 14:37:43 UTC (rev 920)
@@ -47,6 +47,13 @@
</subsection>
<subsection name="Catalina">
<changelog>
+ <fix>
+ <bug>38553</bug>: A lack of certs is normal if the user doesn't have a trusted cert. Return 401,
+ not 400 in this case. (markt)
+ </fix>
+ <fix>
+ <bug>46606</bug>: Max depth limit configurable in WebDAV Servlet. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
@@ -61,6 +68,9 @@
<fix>
Validator code cleanup. (markt)
</fix>
+ <fix>
+ <bug>38197</bug>: Take account of jsp:attribute elements when naming tag pools. (markt)
+ </fix>
</changelog>
</subsection>
</section>
15 years, 3 months
- 1
- 0
JBossWeb SVN: r919 - trunk/java/org/apache/catalina/core.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2009-02-04 09:26:24 -0500 (Wed, 04 Feb 2009)
New Revision: 919
Modified:
trunk/java/org/apache/catalina/core/ContainerBase.java
trunk/java/org/apache/catalina/core/StandardContext.java
Log:
- Remove serializable.
Modified: trunk/java/org/apache/catalina/core/ContainerBase.java
===================================================================
--- trunk/java/org/apache/catalina/core/ContainerBase.java 2009-02-02 12:16:54 UTC (rev 918)
+++ trunk/java/org/apache/catalina/core/ContainerBase.java 2009-02-04 14:26:24 UTC (rev 919)
@@ -22,7 +22,6 @@
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
import java.io.IOException;
-import java.io.Serializable;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.ArrayList;
@@ -57,7 +56,6 @@
import org.apache.naming.resources.ProxyDirContext;
import org.apache.tomcat.util.modeler.Registry;
import org.jboss.logging.Logger;
-import org.jboss.logging.Logger;
/**
@@ -121,7 +119,7 @@
*/
public abstract class ContainerBase
- implements Container, Lifecycle, Pipeline, MBeanRegistration, Serializable {
+ implements Container, Lifecycle, Pipeline, MBeanRegistration {
private static org.jboss.logging.Logger log=
org.jboss.logging.Logger.getLogger( ContainerBase.class );
@@ -1406,7 +1404,7 @@
protected String suffix;
protected ObjectName oname;
protected ObjectName controller;
- protected transient MBeanServer mserver;
+ protected MBeanServer mserver;
public ObjectName getJmxName() {
return oname;
Modified: trunk/java/org/apache/catalina/core/StandardContext.java
===================================================================
--- trunk/java/org/apache/catalina/core/StandardContext.java 2009-02-02 12:16:54 UTC (rev 918)
+++ trunk/java/org/apache/catalina/core/StandardContext.java 2009-02-04 14:26:24 UTC (rev 919)
@@ -121,9 +121,9 @@
public class StandardContext
extends ContainerBase
- implements Context, Serializable, NotificationEmitter
+ implements Context, NotificationEmitter
{
- private static transient Logger log = Logger.getLogger(StandardContext.class);
+ private static Logger log = Logger.getLogger(StandardContext.class);
// ----------------------------------------------------------- Constructors
@@ -220,14 +220,14 @@
/**
* The set of instantiated application event listener objects</code>.
*/
- private transient Object applicationEventListenersObjects[] =
+ private Object applicationEventListenersObjects[] =
new Object[0];
/**
* The set of instantiated application lifecycle listener objects</code>.
*/
- private transient Object applicationLifecycleListenersObjects[] =
+ private Object applicationLifecycleListenersObjects[] =
new Object[0];
@@ -246,12 +246,12 @@
/**
* The broadcaster that sends j2ee notifications.
*/
- private transient NotificationBroadcasterSupport broadcaster = null;
+ private NotificationBroadcasterSupport broadcaster = null;
/**
* The Locale to character set mapper for this application.
*/
- private transient CharsetMapper charsetMapper = null;
+ private CharsetMapper charsetMapper = null;
/**
@@ -282,7 +282,7 @@
/**
* The ServletContext implementation associated with this Context.
*/
- protected transient ApplicationContext context = null;
+ protected ApplicationContext context = null;
/**
@@ -425,14 +425,14 @@
/**
* The mapper associated with this context.
*/
- private transient org.apache.tomcat.util.http.mapper.Mapper mapper =
+ private org.apache.tomcat.util.http.mapper.Mapper mapper =
new org.apache.tomcat.util.http.mapper.Mapper();
/**
* The naming context listener for this web application.
*/
- private transient NamingContextListener namingContextListener = null;
+ private NamingContextListener namingContextListener = null;
/**
@@ -680,7 +680,7 @@
/**
* Non proxied resources.
*/
- private transient DirContext webappResources = null;
+ private DirContext webappResources = null;
private long startupTime;
private long startTime;
15 years, 3 months
- 1
- 0
JBossWeb SVN: r918 - in trunk: webapps/docs and 1 other directory.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2009-02-02 07:16:54 -0500 (Mon, 02 Feb 2009)
New Revision: 918
Modified:
trunk/java/org/apache/jasper/compiler/Validator.java
trunk/webapps/docs/aio.xml
trunk/webapps/docs/changelog.xml
Log:
- Port new Validator case sensitivity fix.
- Expand a bit the doc for scalability and syncing.
Modified: trunk/java/org/apache/jasper/compiler/Validator.java
===================================================================
--- trunk/java/org/apache/jasper/compiler/Validator.java 2009-02-02 12:16:26 UTC (rev 917)
+++ trunk/java/org/apache/jasper/compiler/Validator.java 2009-02-02 12:16:54 UTC (rev 918)
@@ -37,7 +37,6 @@
import javax.servlet.jsp.tagext.ValidationMessage;
import org.apache.el.lang.ELSupport;
-import org.apache.jasper.Constants;
import org.apache.jasper.JasperException;
import org.apache.jasper.el.ELContextImpl;
import org.xml.sax.Attributes;
Modified: trunk/webapps/docs/aio.xml
===================================================================
--- trunk/webapps/docs/aio.xml 2009-02-02 12:16:26 UTC (rev 917)
+++ trunk/webapps/docs/aio.xml 2009-02-02 12:16:54 UTC (rev 918)
@@ -39,6 +39,15 @@
other source).
</p>
+ <p>
+ The number of concurrent connections that can be handled by JBoss Web is constrained by the
+ poller size that has been configured on the connector (see the pollerSize attribute in the APR
+ documentation). JBoss Web uses two separate pollers for keep alive and event processing, so by
+ default it can handle a maximum of 8192 kept alive connections and 8192 event driven connections
+ (for event connections, failure to put a socket in the poller will result in the end of the
+ processing of the connection).
+ </p>
+
<subsection name="HttpEvent">
<p>
@@ -180,6 +189,14 @@
concurrent writes done on the same connection should likely synchronize on the event object.
</p>
+ <p>
+ When the processing of the END or ERROR event is done, the connection may be closed, and no
+ additional data should be written on the connection. Unsynchronized asynchronous writes may
+ cause stability issues when this happens. It is valid however to add the proper synchronization
+ in the END or ERROR event processing (so that they wait for the asynchronous write loop to get
+ done rather than synchronizing all writes).
+ </p>
+
</subsection>
<subsection name="HttpEventFilter">
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2009-02-02 12:16:26 UTC (rev 917)
+++ trunk/webapps/docs/changelog.xml 2009-02-02 12:16:54 UTC (rev 918)
@@ -40,6 +40,31 @@
</subsection>
</section>
+<section name="JBoss Web 2.1.2.GA (remm)">
+ <subsection name="General">
+ <changelog>
+ </changelog>
+ </subsection>
+ <subsection name="Catalina">
+ <changelog>
+ </changelog>
+ </subsection>
+ <subsection name="Coyote">
+ <changelog>
+ </changelog>
+ </subsection>
+ <subsection name="Jasper">
+ <changelog>
+ <fix>
+ <bug>46564</bug>: More case insensitive comparison of encodings. (markt)
+ </fix>
+ <fix>
+ Validator code cleanup. (markt)
+ </fix>
+ </changelog>
+ </subsection>
+</section>
+
<section name="JBoss Web 2.1.2.CR1 (remm)">
<subsection name="General">
<changelog>
15 years, 3 months
- 1
- 0
JBossWeb SVN: r917 - in branches/2.1.x: webapps/docs and 1 other directory.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2009-02-02 07:16:26 -0500 (Mon, 02 Feb 2009)
New Revision: 917
Modified:
branches/2.1.x/java/org/apache/jasper/compiler/Validator.java
branches/2.1.x/webapps/docs/aio.xml
branches/2.1.x/webapps/docs/changelog.xml
Log:
- Port new Validator case sensitivity fix.
- Expand a bit the doc for scalability and syncing.
Modified: branches/2.1.x/java/org/apache/jasper/compiler/Validator.java
===================================================================
--- branches/2.1.x/java/org/apache/jasper/compiler/Validator.java 2009-01-29 21:35:41 UTC (rev 916)
+++ branches/2.1.x/java/org/apache/jasper/compiler/Validator.java 2009-02-02 12:16:26 UTC (rev 917)
@@ -37,7 +37,6 @@
import javax.servlet.jsp.tagext.ValidationMessage;
import org.apache.el.lang.ELSupport;
-import org.apache.jasper.Constants;
import org.apache.jasper.JasperException;
import org.apache.jasper.el.ELContextImpl;
import org.xml.sax.Attributes;
Modified: branches/2.1.x/webapps/docs/aio.xml
===================================================================
--- branches/2.1.x/webapps/docs/aio.xml 2009-01-29 21:35:41 UTC (rev 916)
+++ branches/2.1.x/webapps/docs/aio.xml 2009-02-02 12:16:26 UTC (rev 917)
@@ -39,6 +39,15 @@
other source).
</p>
+ <p>
+ The number of concurrent connections that can be handled by JBoss Web is constrained by the
+ poller size that has been configured on the connector (see the pollerSize attribute in the APR
+ documentation). JBoss Web uses two separate pollers for keep alive and event processing, so by
+ default it can handle a maximum of 8192 kept alive connections and 8192 event driven connections
+ (for event connections, failure to put a socket in the poller will result in the end of the
+ processing of the connection).
+ </p>
+
<subsection name="HttpEvent">
<p>
@@ -180,6 +189,14 @@
concurrent writes done on the same connection should likely synchronize on the event object.
</p>
+ <p>
+ When the processing of the END or ERROR event is done, the connection may be closed, and no
+ additional data should be written on the connection. Unsynchronized asynchronous writes may
+ cause stability issues when this happens. It is valid however to add the proper synchronization
+ in the END or ERROR event processing (so that they wait for the asynchronous write loop to get
+ done rather than synchronizing all writes).
+ </p>
+
</subsection>
<subsection name="HttpEventFilter">
Modified: branches/2.1.x/webapps/docs/changelog.xml
===================================================================
--- branches/2.1.x/webapps/docs/changelog.xml 2009-01-29 21:35:41 UTC (rev 916)
+++ branches/2.1.x/webapps/docs/changelog.xml 2009-02-02 12:16:26 UTC (rev 917)
@@ -16,6 +16,31 @@
<body>
+<section name="JBoss Web 2.1.2.GA (remm)">
+ <subsection name="General">
+ <changelog>
+ </changelog>
+ </subsection>
+ <subsection name="Catalina">
+ <changelog>
+ </changelog>
+ </subsection>
+ <subsection name="Coyote">
+ <changelog>
+ </changelog>
+ </subsection>
+ <subsection name="Jasper">
+ <changelog>
+ <fix>
+ <bug>46564</bug>: More case insensitive comparison of encodings. (markt)
+ </fix>
+ <fix>
+ Validator code cleanup. (markt)
+ </fix>
+ </changelog>
+ </subsection>
+</section>
+
<section name="JBoss Web 2.1.2.CR1 (remm)">
<subsection name="General">
<changelog>
15 years, 3 months
- 1
- 0