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

Merge remote-tracking branch 'origin/jetty-9.3.x'

This commit is contained in:
Greg Wilkins 2015-11-26 07:08:06 +11:00
parent 7125d52fdf a2c057892e
commit ac124094dd
4 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
jetty-http/src/main/java/org/eclipse/jetty/http/HttpField.java
View File

@ -21,6 +21,8 @@ package org.eclipse.jetty.http;
import java.util.ArrayList;
import java.util.Objects;
import org.eclipse.jetty.util.StringUtil;
/** A HTTP Field
*/
public class HttpField
@ -191,7 +193,7 @@ public class HttpField
/* ------------------------------------------------------------ */
/** Look for a value in a possible multi valued field
* @param search Values to search for
* @param search Values to search for (case insensitive)
* @return True iff the value is contained in the field value entirely or
* as an element of a quoted comma separated list. List element parameters (eg qualities) are ignored,
* except if they are q=0, in which case the item itself is ignored.
@ -204,6 +206,8 @@ public class HttpField
return false;
if (_value==null)
return false;
search = StringUtil.asciiToLowerCase(search);
int state=0;
int match=0;
@ -236,7 +240,7 @@ public class HttpField
break;
default: // character
match = c==search.charAt(0)?1:-1;
match = Character.toLowerCase(c)==search.charAt(0)?1:-1;
state=1;
break;
}
@ -261,7 +265,7 @@ public class HttpField
if (match>0)
{
if (match<search.length())
match=c==search.charAt(match)?(match+1):-1;
match=Character.toLowerCase(c)==search.charAt(match)?(match+1):-1;
else if (c!=' ' && c!= '\t')
match=-1;
}
@ -285,7 +289,7 @@ public class HttpField
if (match>=0)
{
if (match<search.length())
match=c==search.charAt(match)?(match+1):-1;
match=Character.toLowerCase(c)==search.charAt(match)?(match+1):-1;
else
match=-1;
}
@ -296,7 +300,7 @@ public class HttpField
if (match>=0)
{
if (match<search.length())
match=c==search.charAt(match)?(match+1):-1;
match=Character.toLowerCase(c)==search.charAt(match)?(match+1):-1;
else
match=-1;
}
@ -346,7 +350,7 @@ public class HttpField
if (param>=0)
{
if (param<__zeroquality.length())
param=c==__zeroquality.charAt(param)?(param+1):-1;
param=Character.toLowerCase(c)==__zeroquality.charAt(param)?(param+1):-1;
else if (c!='0'&&c!='.')
param=-1;
}

17
jetty-http/src/test/java/org/eclipse/jetty/http/HttpFieldTest.java
View File

@ -35,10 +35,13 @@ public class HttpFieldTest
@Test
public void testContainsSimple() throws Exception
{
HttpField field = new HttpField("name","somevalue");
HttpField field = new HttpField("name","SomeValue");
assertTrue(field.contains("somevalue"));
assertTrue(field.contains("sOmEvAlUe"));
assertTrue(field.contains("SomeValue"));
assertFalse(field.contains("other"));
assertFalse(field.contains("some"));
assertFalse(field.contains("Some"));
assertFalse(field.contains("value"));
assertFalse(field.contains("v"));
assertFalse(field.contains(""));
@ -66,10 +69,16 @@ public class HttpFieldTest
@Test
public void testContainsList() throws Exception
{
HttpField field = new HttpField("name",",aaa,bbb,ccc, ddd , e e, \"\\\"f,f\\\"\", ");
HttpField field = new HttpField("name",",aaa,Bbb,CCC, ddd , e e, \"\\\"f,f\\\"\", ");
assertTrue(field.contains("aaa"));
assertTrue(field.contains("bbb"));
assertTrue(field.contains("ccc"));
assertTrue(field.contains("Aaa"));
assertTrue(field.contains("Bbb"));
assertTrue(field.contains("Ccc"));
assertTrue(field.contains("AAA"));
assertTrue(field.contains("BBB"));
assertTrue(field.contains("CCC"));
assertTrue(field.contains("ddd"));
assertTrue(field.contains("e e"));
assertTrue(field.contains("\"f,f\""));
@ -125,6 +134,10 @@ public class HttpFieldTest
field = new HttpField("name","no;q=0.0000,yes;q=0.0001,no; q = 0.00000");
assertTrue(field.contains("yes"));
assertFalse(field.contains("no"));
field = new HttpField("name","no;q=0.0000,Yes;Q=0.0001,no; Q = 0.00000");
assertTrue(field.contains("yes"));
assertFalse(field.contains("no"));
}

2
jetty-http2/http2-server/src/test/java/org/eclipse/jetty/http2/server/HTTP2CServerTest.java
View File

@ -115,7 +115,7 @@ public class HTTP2CServerTest extends AbstractServerTest
output.write(("" +
"GET /one HTTP/1.1\r\n" +
"Host: localhost\r\n" +
"Connection: Upgrade, HTTP2-Settings\r\n" +
"Connection: something, else, upgrade, HTTP2-Settings\r\n" +
"Upgrade: h2c\r\n" +
"HTTP2-Settings: \r\n" +
"\r\n").getBytes(StandardCharsets.ISO_8859_1));

2
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelOverHttp.java
View File

@ -370,7 +370,7 @@ class HttpChannelOverHttp extends HttpChannel implements HttpParser.RequestHandl
if (LOG.isDebugEnabled())
LOG.debug("upgrade {} {}",this,_upgrade);
if (_upgrade!=PREAMBLE_UPGRADE_H2C && (_connection==null || !_connection.getValue().contains("Upgrade")))
if (_upgrade!=PREAMBLE_UPGRADE_H2C && (_connection==null || !_connection.contains("upgrade")))
throw new BadMessageException(HttpStatus.BAD_REQUEST_400);
// Find the upgrade factory