Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

397111 Allow multipart bodies with leading blank lines 

Also trim any leading space from FIRST boundary
This commit is contained in:
Jan Bartel 2012-12-22 14:00:46 +11:00
parent c9135e34c9
commit 0420365f82
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
View File

@ -151,6 +151,7 @@ public class MultiPartFilter implements Filter
if (line == null || line.length() == 0) if (line == null || line.length() == 0)
throw new IOException("Missing content for multipart request"); throw new IOException("Missing content for multipart request");
line = line.trim();
boolean badFormatLogged = false; boolean badFormatLogged = false;
while (line != null && !line.equals(boundary)) while (line != null && !line.equals(boundary))
{ {
@ -160,6 +161,7 @@ public class MultiPartFilter implements Filter
badFormatLogged = true; badFormatLogged = true;
} }
line=((ReadLineInputStream)in).readLine(); line=((ReadLineInputStream)in).readLine();
line=(line==null?line:line.trim());
} }
if (line == null || line.length() == 0) if (line == null || line.length() == 0)

1
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
View File

@ -67,6 +67,7 @@ public class MultipartFilterTest
@Override @Override
protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
{ {
System.err.println(req.getParameter("field1"));
assertNotNull(req.getParameter("fileup")); assertNotNull(req.getParameter("fileup"));
assertNotNull(req.getParameter("fileup"+MultiPartFilter.CONTENT_TYPE_SUFFIX)); assertNotNull(req.getParameter("fileup"+MultiPartFilter.CONTENT_TYPE_SUFFIX));
assertEquals(req.getParameter("fileup"+MultiPartFilter.CONTENT_TYPE_SUFFIX), "application/octet-stream"); assertEquals(req.getParameter("fileup"+MultiPartFilter.CONTENT_TYPE_SUFFIX), "application/octet-stream");