Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2013-09-09 07:11:38 +0000
committerGreg Wilkins2013-09-09 07:11:38 +0000
commit843e94e4e0ef2d516f2cfe2de6c8d3aadd91b38f (patch)
tree4ef830b9d72c11da641cd557deaaeb8c1bf75bfd /jetty-http
parent070ce9dd22eb84f42c213a6f97ca95df2ac332ed (diff)
parente2e1b47edf17b2950a9eb8f35473496e5effd67d (diff)
downloadorg.eclipse.jetty.project-843e94e4e0ef2d516f2cfe2de6c8d3aadd91b38f.tar.gz
org.eclipse.jetty.project-843e94e4e0ef2d516f2cfe2de6c8d3aadd91b38f.tar.xz
org.eclipse.jetty.project-843e94e4e0ef2d516f2cfe2de6c8d3aadd91b38f.zip
Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts: jetty-server/src/test/java/org/eclipse/jetty/server/RequestTest.java
Diffstat (limited to 'jetty-http')
-rw-r--r--jetty-http/src/main/java/org/eclipse/jetty/http/HttpFields.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/jetty-http/src/main/java/org/eclipse/jetty/http/HttpFields.java b/jetty-http/src/main/java/org/eclipse/jetty/http/HttpFields.java
index 41316562e1..e990ea5898 100644
--- a/jetty-http/src/main/java/org/eclipse/jetty/http/HttpFields.java
+++ b/jetty-http/src/main/java/org/eclipse/jetty/http/HttpFields.java
@@ -442,7 +442,7 @@ public class HttpFields implements Iterable<HttpField>
{
final HttpField f = _fields.get(i);
- if (f.getName().equalsIgnoreCase(name))
+ if (f.getName().equalsIgnoreCase(name) && f.getValue()!=null)
{
final int first=i;
return new Enumeration<String>()
@@ -458,7 +458,7 @@ public class HttpFields implements Iterable<HttpField>
while (i<_fields.size())
{
field=_fields.get(i++);
- if (field.getName().equalsIgnoreCase(name))
+ if (field.getName().equalsIgnoreCase(name) && field.getValue()!=null)
return true;
}
field=null;

Back to the top