Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Undisable and fix PartialRFC2616Test #12486

Merged
merged 1 commit into from
Nov 6, 2024
Merged

Undisable and fix PartialRFC2616Test #12486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/internal/HttpConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1305,8 +1305,7 @@ public boolean is100ContinueExpected()
{
if (_unknownExpectation)
{
_requestHandler.badMessage(new BadMessageException(HttpStatus.EXPECTATION_FAILED_417));
return null;
throw new BadMessageException(HttpStatus.EXPECTATION_FAILED_417);
}

persistent = getHttpConfiguration().isPersistentConnectionsEnabled() &&
Expand Down
7 changes: 1 addition & 6 deletions jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/PartialRFC2616Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
import org.eclipse.jetty.server.handler.DumpHandler;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;

import static org.hamcrest.MatcherAssert.assertThat;
Expand Down Expand Up @@ -410,7 +409,6 @@ public void test444() throws Exception
* @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>
*/
@Test
@Disabled // TODO
public void test521() throws Exception
{
// Default Host
Expand Down Expand Up @@ -494,7 +492,6 @@ public void test81() throws Exception
}

@Test
@Disabled // TODO
public void test10418() throws Exception
{
// Expect Failure
Expand Down Expand Up @@ -550,7 +547,6 @@ public void test823() throws Exception
}

@Test
@Disabled // TODO
public void test824() throws Exception
{
// Expect 100 not sent
Expand Down Expand Up @@ -609,7 +605,6 @@ public void test94()
}

@Test
@Disabled // TODO
public void test1423() throws Exception
{
try (StacklessLogging stackless = new StacklessLogging(HttpParser.class))
Expand All @@ -628,7 +623,7 @@ public void test1423() throws Exception

offset = 0;
response = connector.getResponse("GET /R1 HTTP/1.1\n" + "Host:\n" + "Connection: close\n" + "\n");
offset = checkContains(response, offset, "HTTP/1.1 200", "200") + 1;
offset = checkContains(response, offset, "HTTP/1.1 400", "400") + 1;
}
}

Expand Down
Loading