Author: markt Date: Sat Dec 31 18:28:41 2011 New Revision: 1226159 URL: http://svn.apache.org/viewvc?rev=1226159&view=rev Log: https://issues.apache.org/bugzilla/show_bug.cgi?id=52405 Servlet 3.0 Rev A updates Item 2 of 20 javax.servlet.annotation.MultipartConfig.location may be relative and if it is, it is relatve to TEMPDIR
Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=1226159&r1=1226158&r2=1226159&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original) +++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Sat Dec 31 18:28:41 2011 @@ -2483,10 +2483,17 @@ public class Request location = ((File) context.getServletContext().getAttribute( ServletContext.TEMPDIR)); } else { + // If relative, it is relative to TEMPDIR location = new File(locationStr); + if (!location.isAbsolute()) { + location = new File( + (File) context.getServletContext().getAttribute( + ServletContext.TEMPDIR), + locationStr).getAbsoluteFile(); + } } - if (!location.isAbsolute() || !location.isDirectory()) { + if (!location.isDirectory()) { partsParseException = new IOException( sm.getString("coyoteRequest.uploadLocationInvalid", location)); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org