geckon01/php-curl-class
1
0
Fork 0
mirror of https://github.com/php-curl-class/php-curl-class.git synced 2026-09-01 13:19:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix response parsing when 100 Continue response contains optional headers

Browse Source
This commit is contained in:
Zach Borboa
2014-04-16 23:05:12 -07:00
parent b2435aa554
commit efefd889f1
2 changed files with 38 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Curl.class.php
+5 -1
View File
@@ -284,7 +284,11 @@ class Curl
$response_headers = '';
if (!(strpos($response, "\r\n\r\n") === false)) {
list($response_header, $response) = explode("\r\n\r\n", $response, 2);
if ($response_header === 'HTTP/1.1 100 Continue') {
$response_headers = array($response_header);
if (!(strpos($response_header, "\r\n") === false)) {
$response_headers = explode("\r\n", $response_header);
}
if (in_array('HTTP/1.1 100 Continue', $response_headers)) {
list($response_header, $response) = explode("\r\n\r\n", $response, 2);
}
$response_headers = $this->parseResponseHeaders($response_header);
tests/PHPCurlClass/PHPCurlClassTest.php
+33
View File
@@ -85,6 +85,39 @@ class CurlTest extends PHPUnit_Framework_TestCase {
)) === 'POST');
}
public function testPostContinueResponse() {
// 100 Continue responses may contain additional optional headers per
// RFC 2616, Section 10.1:
// This class of status code indicates a provisional response,
// consisting only of the Status-Line and optional headers, and is
// terminated by an empty line.
$response =
'HTTP/1.1 100 Continue' . "\r\n" .
'Date: Fri, 01 Jan 1990 00:00:00 GMT' . "\r\n" .
'Server: PHP-Curl-Class' . "\r\n" .
"\r\n" .
'HTTP/1.1 200 OK' . "\r\n" .
'Date: Fri, 01 Jan 1990 00:00:00 GMT' . "\r\n" .
'Cache-Control: private' . "\r\n" .
'Vary: Accept-Encoding' . "\r\n" .
'Content-Length: 2' . "\r\n" .
'Content-Type: text/plain;charset=UTF-8' . "\r\n" .
'Server: PHP-Curl-Class' . "\r\n" .
'Connection: keep-alive' . "\r\n" .
"\r\n" .
'OK';
$reflector = new ReflectionClass('Curl');
$reflection_method = $reflector->getMethod('parseResponse');
$reflection_method->setAccessible(true);
$curl = new Curl();
list($response_headers, $response) = $reflection_method->invoke($curl, $response);
$this->assertEquals($response_headers['Status-Line'], 'HTTP/1.1 200 OK');
$this->assertEquals($response, 'OK');
}
public function testPostData() {
$test = new Test();
$this->assertTrue($test->server('post', 'POST', array(