diff options
author | Jan Bartel | 2013-08-05 08:03:11 +0000 |
---|---|---|
committer | Jan Bartel | 2013-08-05 08:03:11 +0000 |
commit | 432964cf5fc669fe86fded615ce492e0c3c62d95 (patch) | |
tree | de89f40ba3f71c4458b8aa201c0c8b2e0157a8ce /jetty-servlets/src | |
parent | 446820071bc1910f11b386bc07c8ceabec629375 (diff) | |
parent | f3f2bce36c2c4588b3421bb81f64fe082cccbde6 (diff) | |
download | org.eclipse.jetty.project-432964cf5fc669fe86fded615ce492e0c3c62d95.tar.gz org.eclipse.jetty.project-432964cf5fc669fe86fded615ce492e0c3c62d95.tar.xz org.eclipse.jetty.project-432964cf5fc669fe86fded615ce492e0c3c62d95.zip |
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
Diffstat (limited to 'jetty-servlets/src')
-rw-r--r-- | jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java | 34 |
1 files changed, 33 insertions, 1 deletions
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 d79fa4809e..9b99186eb9 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 @@ -757,7 +757,39 @@ public class MultipartFilterTest assertTrue(response.getContent().contains("aaaa,bbbbb")); } - + @Test + public void testBufferOverflowNoCRLF () throws Exception + { + String boundary="XyXyXy"; + // generated and parsed test + HttpTester request = new HttpTester(); + HttpTester response = new HttpTester(); + tester.addServlet(BoundaryServlet.class,"/testb"); + tester.setAttribute("fileName", "abc"); + tester.setAttribute("desc", "123"); + tester.setAttribute("title", "ttt"); + request.setMethod("POST"); + request.setVersion("HTTP/1.0"); + request.setHeader("Host","tester"); + request.setURI("/context/testb"); + request.setHeader("Content-Type","multipart/form-data; boundary="+boundary); + + String content = "--XyXyXy"; + + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + baos.write(content.getBytes()); + + for (int i=0; i< 8500; i++) //create content that will overrun default buffer size of BufferedInputStream + { + baos.write('a'); + } + request.setContent(baos.toString()); + + response.parse(tester.getResponses(request.generate())); + assertTrue(response.getContent().contains("Buffer size exceeded")); + assertEquals(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, response.getStatus()); + } + /* * see the testParameterMap test * |