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

fix: [CURLRequest] Multiple HTTP 100 return by API. #8466

Merged
merged 4 commits into from
Feb 17, 2024
Merged

fix: [CURLRequest] Multiple HTTP 100 return by API. #8466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2de7be1
fix: fix the repeat status code 100 problem.
ping-yee Jan 27, 2024
917607c
test: add the test case for multiple HTTP100.
ping-yee Jan 28, 2024
0c166d2
test: fix the testcase to follow the http response spec.
ping-yee Feb 13, 2024
39e2283
fix: HTTP method name should be uppercase
kenjis Feb 14, 2024
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
2 changes: 1 addition & 1 deletion system/HTTP/CURLRequest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ public function send(string $method, string $url)
// Set the string we want to break our response from
$breakString = "\r\n\r\n";

if (strpos($output, 'HTTP/1.1 100 Continue') === 0) {
while (strpos($output, 'HTTP/1.1 100 Continue') === 0) {
$output = substr($output, strpos($output, $breakString) + 4);
}

Expand Down
26 changes: 26 additions & 0 deletions tests/system/HTTP/CURLRequestTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1109,4 +1109,30 @@ public function testUserAgentOption(): void
$this->assertArrayHasKey(CURLOPT_USERAGENT, $options);
$this->assertSame($agent, $options[CURLOPT_USERAGENT]);
}

/**
* @see https://github.com/codeigniter4/CodeIgniter4/issues/8347
*/
public function testMultipleHTTP100(): void
{
$jsonBody = '{"name":"John Doe","age":30}';

$output = "HTTP/1.1 100 Continue
Mark bundle as not supporting multiuse
HTTP/1.1 100 Continue
Mark bundle as not supporting multiuse
HTTP/1.1 200 OK
Server: Werkzeug/2.2.2 Python/3.7.17
Date: Sun, 28 Jan 2024 06:05:36 GMT
Content-Type: application/json
Content-Length: 33\r\n\r\n" . $jsonBody;

$this->request->setOutput($output);

$response = $this->request->request('GET', 'http://example.com');

$this->assertSame($jsonBody, $response->getBody());

$this->assertSame(200, $response->getStatusCode());
}
}
Loading