Skip to content

Commit e3580b7

Browse files
authored
Undisable and fix PartialRFC2616Test (jetty#12486)
1 parent 6553005 commit e3580b7

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/internal/HttpConnection.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -1292,8 +1292,7 @@ public boolean is100ContinueExpected()
12921292
{
12931293
if (_unknownExpectation)
12941294
{
1295-
_requestHandler.badMessage(new BadMessageException(HttpStatus.EXPECTATION_FAILED_417));
1296-
return null;
1295+
throw new BadMessageException(HttpStatus.EXPECTATION_FAILED_417);
12971296
}
12981297

12991298
persistent = getHttpConfiguration().isPersistentConnectionsEnabled() &&

jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/PartialRFC2616Test.java

+1-6
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import org.eclipse.jetty.server.handler.DumpHandler;
2828
import org.junit.jupiter.api.AfterEach;
2929
import org.junit.jupiter.api.BeforeEach;
30-
import org.junit.jupiter.api.Disabled;
3130
import org.junit.jupiter.api.Test;
3231

3332
import static org.hamcrest.MatcherAssert.assertThat;
@@ -410,7 +409,6 @@ public void test444() throws Exception
410409
* @see <a href="https://www.rfc-editor.org/rfc/rfc2616#section-5.2">RFC 2616 - Section 5.2 - The Resource Identified by a Request</a>
411410
*/
412411
@Test
413-
@Disabled // TODO
414412
public void test521() throws Exception
415413
{
416414
// Default Host
@@ -494,7 +492,6 @@ public void test81() throws Exception
494492
}
495493

496494
@Test
497-
@Disabled // TODO
498495
public void test10418() throws Exception
499496
{
500497
// Expect Failure
@@ -550,7 +547,6 @@ public void test823() throws Exception
550547
}
551548

552549
@Test
553-
@Disabled // TODO
554550
public void test824() throws Exception
555551
{
556552
// Expect 100 not sent
@@ -609,7 +605,6 @@ public void test94()
609605
}
610606

611607
@Test
612-
@Disabled // TODO
613608
public void test1423() throws Exception
614609
{
615610
try (StacklessLogging stackless = new StacklessLogging(HttpParser.class))
@@ -628,7 +623,7 @@ public void test1423() throws Exception
628623

629624
offset = 0;
630625
response = connector.getResponse("GET /R1 HTTP/1.1\n" + "Host:\n" + "Connection: close\n" + "\n");
631-
offset = checkContains(response, offset, "HTTP/1.1 200", "200") + 1;
626+
offset = checkContains(response, offset, "HTTP/1.1 400", "400") + 1;
632627
}
633628
}
634629

0 commit comments

Comments
 (0)