From 37501e0c0bed38b96f1a52c3215c923a229d90c4 Mon Sep 17 00:00:00 2001 From: Jan Bartel Date: Mon, 7 Sep 2009 23:36:26 +0000 Subject: [PATCH] JETTY-1092 git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@824 7e9141cc-0065-0410-87d8-b60c137991c4 --- VERSION.txt | 1 + .../java/org/eclipse/jetty/servlets/MultiPartFilter.java | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/VERSION.txt b/VERSION.txt index 94136d61bfb..1c46a40f741 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -5,6 +5,7 @@ jetty-7.0.0.RC6-SNAPSHOT + JETTY-1080 modify previous fix to work on windows + JETTY-1086 Use UncheckedPrintWriter + JETTY-1090 resolve potential infinite loop with webdav listener + + JETTY-1092 MultiPartFilter can be pushed into infinite loop + JETTY-1093 Request.toString throws exception when size exceeds 4k + 288514 AbstractConnector does not handle InterruptedExceptions on shutdown + 288466 LocalConnector is not thread safe 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 c24f635f7e2..400ce53890d 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 @@ -172,7 +172,12 @@ public class MultiPartFilter implements Filter { continue; } - if(name==null||name.length()==0) + //It is valid for reset and submit buttons to have an empty name. + //If no name is supplied, the browser skips sending the info for that field. + //However, if you supply the empty string as the name, the browser sends the + //field, with name as the empty string. So, only continue this loop if we + //have not yet seen a name field. + if(name==null) { continue; }