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-10.0.x' into jetty-11.0.x

This commit is contained in:
Jan Bartel 2020-05-13 12:22:43 +02:00
parent 16db391f79 74a506161d
commit 4447152330
7 changed files with 180 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,7 +43,7 @@ public class HttpField
if (_header != null && name == null)
_name = _header.asString();
else
_name = Objects.requireNonNull(name);
_name = Objects.requireNonNull(name, "name");
_value = value;
}

11
jetty-http/src/main/java/org/eclipse/jetty/http/HttpFields.java
View File

@ -27,6 +27,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.ListIterator;
import java.util.NoSuchElementException;
import java.util.Objects;
import java.util.Set;
import java.util.function.ToIntFunction;
import java.util.stream.Collectors;
@ -855,6 +856,8 @@ public interface HttpFields extends Iterable<HttpField>
*/
public Mutable put(String name, List<String> list)
{
Objects.requireNonNull(name, "name must not be null");
Objects.requireNonNull(list, "list must not be null");
remove(name);
for (String v : list)
{
@ -1018,6 +1021,9 @@ public interface HttpFields extends Iterable<HttpField>
@Override
public void add(HttpField field)
{
if (field == null)
return;
_fields = Arrays.copyOf(_fields, _fields.length + 1);
System.arraycopy(_fields, _cursor, _fields, _cursor + 1, _size++);
_fields[_cursor++] = field;
@ -1083,7 +1089,10 @@ public interface HttpFields extends Iterable<HttpField>
{
if (_current < 0)
throw new IllegalStateException();
_fields[_current] = field;
if (field == null)
remove();
else
_fields[_current] = field;
}
}
}

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

@ -28,6 +28,7 @@ import static org.hamcrest.Matchers.is;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class HttpFieldTest
@ -165,6 +166,12 @@ public class HttpFieldTest
assertEquals("c", values[2]);
}
@Test
public void testFieldNameNull()
{
assertThrows(NullPointerException.class, () -> new HttpField((String)null, null));
}
@Test
public void testCachedField()
{

259
jetty-http/src/test/java/org/eclipse/jetty/http/HttpFieldsTest.java
View File

@ -19,6 +19,7 @@
package org.eclipse.jetty.http;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Collections;
import java.util.EnumSet;
import java.util.Enumeration;
@ -49,7 +50,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
public class HttpFieldsTest
{
@Test
public void testPut() throws Exception
public void testPut()
{
HttpFields.Mutable header = HttpFields.build()
.put("name0", "value:0")
@ -73,13 +74,13 @@ public class HttpFieldsTest
assertEquals(2, matches);
e = header.getValues("name0");
assertEquals(true, e.hasMoreElements());
assertTrue(e.hasMoreElements());
assertEquals(e.nextElement(), "value:0");
assertEquals(false, e.hasMoreElements());
assertFalse(e.hasMoreElements());
}
@Test
public void testPutTo() throws Exception
public void testPutTo()
{
HttpFields.Mutable header = HttpFields.build()
.put("name0", "value0")
@ -99,7 +100,7 @@ public class HttpFieldsTest
}
@Test
public void testImmutable() throws Exception
public void testImmutable()
{
HttpFields header = HttpFields.build()
.put("name0", "value0")
@ -109,24 +110,21 @@ public class HttpFieldsTest
assertEquals("value0", header.get("Name0"));
assertEquals("value1", header.get("name1"));
assertEquals("value1", header.get("Name1"));
assertEquals(null, header.get("Name2"));
assertNull(header.get("Name2"));
assertEquals("value0", header.getField("name0").getValue());
assertEquals("value0", header.getField("Name0").getValue());
assertEquals("value1", header.getField("name1").getValue());
assertEquals("value1", header.getField("Name1").getValue());
assertEquals(null, header.getField("Name2"));
assertNull(header.getField("Name2"));
assertEquals("value0", header.getField(0).getValue());
assertEquals("value1", header.getField(1).getValue());
assertThrows(NoSuchElementException.class, () ->
{
header.getField(2);
});
assertThrows(NoSuchElementException.class, () -> header.getField(2));
}
@Test
public void testMutable() throws Exception
public void testMutable()
{
HttpFields headers = HttpFields.build()
.add(HttpHeader.ETAG, "tag")
@ -147,20 +145,20 @@ public class HttpFieldsTest
}
@Test
public void testMap() throws Exception
public void testMap()
{
Map<HttpFields.Immutable,String> map = new HashMap<>();
map.put(HttpFields.build().add("X","1").add(HttpHeader.ETAG,"tag").asImmutable(),"1");
map.put(HttpFields.build().add("X","2").add(HttpHeader.ETAG,"other").asImmutable(),"2");
Map<HttpFields.Immutable, String> map = new HashMap<>();
map.put(HttpFields.build().add("X", "1").add(HttpHeader.ETAG, "tag").asImmutable(), "1");
map.put(HttpFields.build().add("X", "2").add(HttpHeader.ETAG, "other").asImmutable(), "2");
assertThat(map.get(HttpFields.build().add("X","1").add(HttpHeader.ETAG,"tag").asImmutable()), is("1"));
assertThat(map.get(HttpFields.build().add("X","2").add(HttpHeader.ETAG,"other").asImmutable()), is("2"));
assertThat(map.get(HttpFields.build().add("X","2").asImmutable()), nullValue());
assertThat(map.get(HttpFields.build().add("X","2").add(HttpHeader.ETAG,"tag").asImmutable()), nullValue());
assertThat(map.get(HttpFields.build().add("X", "1").add(HttpHeader.ETAG, "tag").asImmutable()), is("1"));
assertThat(map.get(HttpFields.build().add("X", "2").add(HttpHeader.ETAG, "other").asImmutable()), is("2"));
assertThat(map.get(HttpFields.build().add("X", "2").asImmutable()), nullValue());
assertThat(map.get(HttpFields.build().add("X", "2").add(HttpHeader.ETAG, "tag").asImmutable()), nullValue());
}
@Test
public void testGet() throws Exception
public void testGet()
{
HttpFields header = HttpFields.build()
.put("name0", "value0")
@ -170,24 +168,21 @@ public class HttpFieldsTest
assertEquals("value0", header.get("Name0"));
assertEquals("value1", header.get("name1"));
assertEquals("value1", header.get("Name1"));
assertEquals(null, header.get("Name2"));
assertNull(header.get("Name2"));
assertEquals("value0", header.getField("name0").getValue());
assertEquals("value0", header.getField("Name0").getValue());
assertEquals("value1", header.getField("name1").getValue());
assertEquals("value1", header.getField("Name1").getValue());
assertEquals(null, header.getField("Name2"));
assertNull(header.getField("Name2"));
assertEquals("value0", header.getField(0).getValue());
assertEquals("value1", header.getField(1).getValue());
assertThrows(NoSuchElementException.class, () ->
{
header.getField(2);
});
assertThrows(NoSuchElementException.class, () -> header.getField(2));
}
@Test
public void testGetKnown() throws Exception
public void testGetKnown()
{
HttpFields.Mutable header = HttpFields.build();
@ -200,12 +195,12 @@ public class HttpFieldsTest
assertEquals("value0", header.getField(HttpHeader.CONNECTION).getValue());
assertEquals("value1", header.getField(HttpHeader.ACCEPT).getValue());
assertEquals(null, header.getField(HttpHeader.AGE));
assertEquals(null, header.get(HttpHeader.AGE));
assertNull(header.getField(HttpHeader.AGE));
assertNull(header.get(HttpHeader.AGE));
}
@Test
public void testCRLF() throws Exception
public void testCRLF()
{
HttpFields.Mutable header = HttpFields.build();
@ -224,7 +219,7 @@ public class HttpFieldsTest
}
@Test
public void testCachedPut() throws Exception
public void testCachedPut()
{
HttpFields.Mutable header = HttpFields.build();
@ -244,7 +239,7 @@ public class HttpFieldsTest
}
@Test
public void testRePut() throws Exception
public void testRePut()
{
HttpFields.Mutable header = HttpFields.build();
@ -278,13 +273,13 @@ public class HttpFieldsTest
assertEquals(3, matches);
e = header.getValues("name1");
assertEquals(true, e.hasMoreElements());
assertTrue(e.hasMoreElements());
assertEquals(e.nextElement(), "value1");
assertEquals(false, e.hasMoreElements());
assertFalse(e.hasMoreElements());
}
@Test
public void testRemove() throws Exception
public void testRemove()
{
HttpFields.Mutable header = HttpFields.build(1)
.put("name0", "value0")
@ -326,11 +321,11 @@ public class HttpFieldsTest
assertEquals(2, matches);
e = header.getValues("name1");
assertEquals(false, e.hasMoreElements());
assertFalse(e.hasMoreElements());
}
@Test
public void testAdd() throws Exception
public void testAdd()
{
HttpFields.Mutable fields = HttpFields.build();
@ -364,11 +359,11 @@ public class HttpFieldsTest
assertEquals(3, matches);
e = fields.getValues("name1");
assertEquals(true, e.hasMoreElements());
assertTrue(e.hasMoreElements());
assertEquals(e.nextElement(), "valueA");
assertEquals(true, e.hasMoreElements());
assertTrue(e.hasMoreElements());
assertEquals(e.nextElement(), "valueB");
assertEquals(false, e.hasMoreElements());
assertFalse(e.hasMoreElements());
}
@Test
@ -412,7 +407,7 @@ public class HttpFieldsTest
}
@Test
public void testGetValues() throws Exception
public void testGetValues()
{
HttpFields.Mutable fields = HttpFields.build();
@ -422,37 +417,37 @@ public class HttpFieldsTest
fields.add("name1", "\"value1C\",\tvalue1D");
Enumeration<String> e = fields.getValues("name0");
assertEquals(true, e.hasMoreElements());
assertTrue(e.hasMoreElements());
assertEquals(e.nextElement(), "value0A,value0B");
assertEquals(true, e.hasMoreElements());
assertTrue(e.hasMoreElements());
assertEquals(e.nextElement(), "value0C,value0D");
assertEquals(false, e.hasMoreElements());
assertFalse(e.hasMoreElements());
e = Collections.enumeration(fields.getCSV("name0", false));
assertEquals(true, e.hasMoreElements());
assertTrue(e.hasMoreElements());
assertEquals(e.nextElement(), "value0A");
assertEquals(true, e.hasMoreElements());
assertTrue(e.hasMoreElements());
assertEquals(e.nextElement(), "value0B");
assertEquals(true, e.hasMoreElements());
assertTrue(e.hasMoreElements());
assertEquals(e.nextElement(), "value0C");
assertEquals(true, e.hasMoreElements());
assertTrue(e.hasMoreElements());
assertEquals(e.nextElement(), "value0D");
assertEquals(false, e.hasMoreElements());
assertFalse(e.hasMoreElements());
e = Collections.enumeration(fields.getCSV("name1", false));
assertEquals(true, e.hasMoreElements());
assertTrue(e.hasMoreElements());
assertEquals(e.nextElement(), "value1A");
assertEquals(true, e.hasMoreElements());
assertTrue(e.hasMoreElements());
assertEquals(e.nextElement(), "value\t, 1B");
assertEquals(true, e.hasMoreElements());
assertTrue(e.hasMoreElements());
assertEquals(e.nextElement(), "value1C");
assertEquals(true, e.hasMoreElements());
assertTrue(e.hasMoreElements());
assertEquals(e.nextElement(), "value1D");
assertEquals(false, e.hasMoreElements());
assertFalse(e.hasMoreElements());
}
@Test
public void testGetCSV() throws Exception
public void testGetCSV()
{
HttpFields.Mutable fields = HttpFields.build();
@ -462,37 +457,37 @@ public class HttpFieldsTest
fields.add("name1", "\"value1C\",\tvalue1D");
Enumeration<String> e = fields.getValues("name0");
assertEquals(true, e.hasMoreElements());
assertTrue(e.hasMoreElements());
assertEquals(e.nextElement(), "value0A,value0B");
assertEquals(true, e.hasMoreElements());
assertTrue(e.hasMoreElements());
assertEquals(e.nextElement(), "value0C,value0D");
assertEquals(false, e.hasMoreElements());
assertFalse(e.hasMoreElements());
e = Collections.enumeration(fields.getCSV("name0", false));
assertEquals(true, e.hasMoreElements());
assertTrue(e.hasMoreElements());
assertEquals(e.nextElement(), "value0A");
assertEquals(true, e.hasMoreElements());
assertTrue(e.hasMoreElements());
assertEquals(e.nextElement(), "value0B");
assertEquals(true, e.hasMoreElements());
assertTrue(e.hasMoreElements());
assertEquals(e.nextElement(), "value0C");
assertEquals(true, e.hasMoreElements());
assertTrue(e.hasMoreElements());
assertEquals(e.nextElement(), "value0D");
assertEquals(false, e.hasMoreElements());
assertFalse(e.hasMoreElements());
e = Collections.enumeration(fields.getCSV("name1", false));
assertEquals(true, e.hasMoreElements());
assertTrue(e.hasMoreElements());
assertEquals(e.nextElement(), "value1A");
assertEquals(true, e.hasMoreElements());
assertTrue(e.hasMoreElements());
assertEquals(e.nextElement(), "value\t, 1B");
assertEquals(true, e.hasMoreElements());
assertTrue(e.hasMoreElements());
assertEquals(e.nextElement(), "value1C");
assertEquals(true, e.hasMoreElements());
assertTrue(e.hasMoreElements());
assertEquals(e.nextElement(), "value1D");
assertEquals(false, e.hasMoreElements());
assertFalse(e.hasMoreElements());
}
@Test
public void testAddQuotedCSV() throws Exception
public void testAddQuotedCSV()
{
HttpFields.Mutable fields = HttpFields.build();
@ -540,7 +535,7 @@ public class HttpFieldsTest
}
@Test
public void testGetQualityCSV() throws Exception
public void testGetQualityCSV()
{
HttpFields.Mutable fields = HttpFields.build();
@ -562,7 +557,7 @@ public class HttpFieldsTest
}
@Test
public void testGetQualityCSVHeader() throws Exception
public void testGetQualityCSVHeader()
{
HttpFields.Mutable fields = HttpFields.build();
@ -584,7 +579,7 @@ public class HttpFieldsTest
}
@Test
public void testDateFields() throws Exception
public void testDateFields()
{
HttpFields.Mutable fields = HttpFields.build();
@ -626,7 +621,7 @@ public class HttpFieldsTest
}
@Test
public void testNegDateFields() throws Exception
public void testNegDateFields()
{
HttpFields.Mutable fields = HttpFields.build();
@ -644,7 +639,7 @@ public class HttpFieldsTest
}
@Test
public void testLongFields() throws Exception
public void testLongFields()
{
HttpFields.Mutable header = HttpFields.build();
@ -656,47 +651,12 @@ public class HttpFieldsTest
header.put("N2", "xx");
long i1 = header.getLongField("I1");
try
{
header.getLongField("I2");
assertTrue(false);
}
catch (NumberFormatException e)
{
assertTrue(true);
}
assertThrows(NumberFormatException.class, () -> header.getLongField("I2"));
long i3 = header.getLongField("I3");
try
{
header.getLongField("I4");
assertTrue(false);
}
catch (NumberFormatException e)
{
assertTrue(true);
}
try
{
header.getLongField("N1");
assertTrue(false);
}
catch (NumberFormatException e)
{
assertTrue(true);
}
try
{
header.getLongField("N2");
assertTrue(false);
}
catch (NumberFormatException e)
{
assertTrue(true);
}
assertThrows(NumberFormatException.class, () -> header.getLongField("I4"));
assertThrows(NumberFormatException.class, () -> header.getLongField("N1"));
assertThrows(NumberFormatException.class, () -> header.getLongField("N2"));
assertEquals(42, i1);
assertEquals(-44, i3);
@ -708,7 +668,7 @@ public class HttpFieldsTest
}
@Test
public void testContains() throws Exception
public void testContains()
{
HttpFields.Mutable header = HttpFields.build();
@ -768,6 +728,73 @@ public class HttpFieldsTest
assertFalse(fields.contains(keyName), "containsKey('" + keyName + "')");
}
@Test
public void testAddNullName()
{
HttpFields.Mutable fields = HttpFields.build();
assertThrows(NullPointerException.class, () -> fields.add((String)null, "bogus"));
assertThat(fields.size(), is(0));
assertThrows(NullPointerException.class, () -> fields.add((HttpHeader)null, "bogus"));
assertThat(fields.size(), is(0));
}
@Test
public void testPutNullName()
{
HttpFields.Mutable fields = HttpFields.build();
assertThrows(NullPointerException.class, () -> fields.put((String)null, "bogus"));
assertThat(fields.size(), is(0));
assertThrows(NullPointerException.class, () -> fields.put(null, (List<String>)null));
assertThat(fields.size(), is(0));
List<String> emptyList = new ArrayList<>();
assertThrows(NullPointerException.class, () -> fields.put(null, emptyList));
assertThat(fields.size(), is(0));
assertThrows(NullPointerException.class, () -> fields.put((HttpHeader)null, "bogus"));
assertThat(fields.size(), is(0));
}
@Test
public void testPutNullValueList()
{
HttpFields.Mutable fields = HttpFields.build();
assertThrows(NullPointerException.class, () -> fields.put("name", (List<String>)null));
assertThat(fields.size(), is(0));
}
@Test
public void testPreventNullFieldEntry()
{
// Attempt various ways that may have put a null field in the array that
// previously caused a NPE in put.
HttpFields.Mutable fields = HttpFields.build();
fields.add((HttpField)null); // should not result in field being added
assertThat(fields.size(), is(0));
fields.put(null); // should not result in field being added
assertThat(fields.size(), is(0));
fields.put("something", "else");
assertThat(fields.size(), is(1));
ListIterator<HttpField> iter = fields.listIterator();
iter.next();
iter.set(null); // set field to null - should result in noop
assertThat(fields.size(), is(0));
iter.add(null); // attempt to add null entry
assertThat(fields.size(), is(0));
fields.put("something", "other");
assertThat(fields.size(), is(1));
iter = fields.listIterator();
iter.next();
iter.remove(); // remove only entry
assertThat(fields.size(), is(0));
fields.put("something", "other");
assertThat(fields.size(), is(1));
fields.clear();
}
@Test
public void testPreventNullField()
{
@ -780,7 +807,7 @@ public class HttpFieldsTest
}
@Test
public void testIteration() throws Exception
public void testIteration()
{
HttpFields.Mutable header = HttpFields.build();
Iterator<HttpField> i = header.iterator();

9
jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Flusher.java
View File

@ -21,6 +21,8 @@ package org.eclipse.jetty.http2;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.ArrayDeque;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Deque;
import java.util.HashSet;
import java.util.Iterator;
@ -47,7 +49,7 @@ public class HTTP2Flusher extends IteratingCallback implements Dumpable
private final Queue<WindowEntry> windows = new ArrayDeque<>();
private final Deque<Entry> entries = new ArrayDeque<>();
private final Queue<Entry> pendingEntries = new ArrayDeque<>();
private final Set<Entry> processedEntries = new HashSet<>();
private final Collection<Entry> processedEntries = new ArrayList<>();
private final HTTP2Session session;
private final ByteBufferPool.Lease lease;
private Throwable terminated;
@ -192,7 +194,10 @@ public class HTTP2Flusher extends IteratingCallback implements Dumpable
progress = true;
processedEntries.add(entry);
// We use ArrayList contains() + add() instead of HashSet add()
// because that is faster for collections of size up to 250 entries.
if (!processedEntries.contains(entry))
processedEntries.add(entry);
if (entry.getDataBytesRemaining() == 0)
pending.remove();

13
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
View File

@ -419,8 +419,17 @@ public class HttpChannel implements Runnable, HttpOutput.Interceptor
abort(x);
else
{
_response.resetContent();
sendResponseAndComplete();
try
{
_response.resetContent();
sendResponseAndComplete();
}
catch (Throwable t)
{
if (x != t)
x.addSuppressed(t);
abort(x);
}
}
}
finally

2
pom.xml
View File

@ -33,7 +33,7 @@
<inject-api.version>2.0.0-RC2</inject-api.version>
<infinispan.version>9.4.8.Final</infinispan.version>
<conscrypt.version>2.4.0</conscrypt.version>
<asm.version>7.2</asm.version>
<asm.version>7.3.1</asm.version>
<jmh.version>1.21</jmh.version>
<jmhjar.name>benchmarks</jmhjar.name>
<tycho-version>1.4.0</tycho-version>