diff options
3 files changed, 3 insertions, 2 deletions
diff --git a/VERSION.txt b/VERSION.txt index 263dc012fd..5988485ada 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -21,6 +21,7 @@ jetty-7.3.1-SNAPSHOT + 338068 Leaking ConstraintMappings on redeploy + 338092 ProxyServlet leaks memory + 338607 Removed managed attributes when context is stopped + + JETTY-1304 Allow quoted boundaries in Multipart filter + JETTY-1317 More elegent handling of bad URIs in requests + JETTY-1331 Allow alternate XML configuration processors (eg spring) + JETTY-1335 HttpClient's SelectConnector clean-up diff --git a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java index a82cebc09f..4111a1de6f 100644 --- a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java +++ b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java @@ -102,8 +102,8 @@ public class MultiPartFilter implements Filter String content_type=srequest.getContentType(); // TODO - handle encodings + String boundary="--"+QuotedStringTokenizer.unquote(value(content_type.substring(content_type.indexOf("boundary="))).trim()); - String boundary="--"+value(content_type.substring(content_type.indexOf("boundary="))); byte[] byteBoundary=(boundary+"--").getBytes(StringUtil.__ISO_8859_1); MultiMap params = new MultiMap(); diff --git a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java index 74412d124e..2dc3048024 100644 --- a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java +++ b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java @@ -108,7 +108,7 @@ public class MultipartFilterTest request.setURI("/context/dump"); String boundary="XyXyXy"; - request.setHeader("Content-Type","multipart/form-data; boundary="+boundary); + request.setHeader("Content-Type","multipart/form-data; boundary=\""+boundary+"\""); String content = "--" + boundary + "\r\n"+ |