geckon01/php-curl-class
1
0
Fork 0
mirror of https://github.com/php-curl-class/php-curl-class.git synced 2026-08-30 04:01:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #494 from zachborboa/master

Browse Source 
Fix #493: Build POST data correctly when headers have been set
This commit is contained in:
Zach Borboa
2018-01-26 01:16:34 -08:00
committed by GitHub
parent 44c1539ba6 40f7026185
commit b6ad72fee4
2 changed files with 90 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Curl/MultiCurl.php
+25 -10
View File
@@ -58,10 +58,10 @@ class MultiCurl
$url = $this->baseUrl;
}
$curl = new Curl();
$this->queueHandle($curl);
$curl->setUrl($url, $query_parameters);
$curl->setOpt(CURLOPT_CUSTOMREQUEST, 'DELETE');
$curl->setOpt(CURLOPT_POSTFIELDS, $curl->buildPostData($data));
$this->queueHandle($curl);
return $curl;
}
@@ -77,6 +77,7 @@ class MultiCurl
public function addDownload($url, $mixed_filename)
{
$curl = new Curl();
$this->queueHandle($curl);
$curl->setUrl($url);
// Use tmpfile() or php://temp to avoid "Too many open files" error.
@@ -95,7 +96,6 @@ class MultiCurl
$curl->setOpt(CURLOPT_FILE, $curl->fileHandle);
$curl->setOpt(CURLOPT_CUSTOMREQUEST, 'GET');
$curl->setOpt(CURLOPT_HTTPGET, true);
$this->queueHandle($curl);
return $curl;
}
@@ -115,10 +115,10 @@ class MultiCurl
$url = $this->baseUrl;
}
$curl = new Curl();
$this->queueHandle($curl);
$curl->setUrl($url, $data);
$curl->setOpt(CURLOPT_CUSTOMREQUEST, 'GET');
$curl->setOpt(CURLOPT_HTTPGET, true);
$this->queueHandle($curl);
return $curl;
}
@@ -138,10 +138,10 @@ class MultiCurl
$url = $this->baseUrl;
}
$curl = new Curl();
$this->queueHandle($curl);
$curl->setUrl($url, $data);
$curl->setOpt(CURLOPT_CUSTOMREQUEST, 'HEAD');
$curl->setOpt(CURLOPT_NOBODY, true);
$this->queueHandle($curl);
return $curl;
}
@@ -161,10 +161,10 @@ class MultiCurl
$url = $this->baseUrl;
}
$curl = new Curl();
$this->queueHandle($curl);
$curl->setUrl($url, $data);
$curl->removeHeader('Content-Length');
$curl->setOpt(CURLOPT_CUSTOMREQUEST, 'OPTIONS');
$this->queueHandle($curl);
return $curl;
}
@@ -184,11 +184,11 @@ class MultiCurl
$url = $this->baseUrl;
}
$curl = new Curl();
$this->queueHandle($curl);
$curl->setUrl($url);
$curl->removeHeader('Content-Length');
$curl->setOpt(CURLOPT_CUSTOMREQUEST, 'PATCH');
$curl->setOpt(CURLOPT_POSTFIELDS, $data);
$this->queueHandle($curl);
return $curl;
}
@@ -213,6 +213,7 @@ class MultiCurl
}
$curl = new Curl();
$this->queueHandle($curl);
if (is_array($data) && empty($data)) {
$curl->removeHeader('Content-Length');
@@ -230,7 +231,6 @@ class MultiCurl
$curl->setOpt(CURLOPT_POST, true);
$curl->setOpt(CURLOPT_POSTFIELDS, $curl->buildPostData($data));
$this->queueHandle($curl);
return $curl;
}
@@ -250,6 +250,7 @@ class MultiCurl
$url = $this->baseUrl;
}
$curl = new Curl();
$this->queueHandle($curl);
$curl->setUrl($url);
$curl->setOpt(CURLOPT_CUSTOMREQUEST, 'PUT');
$put_data = $curl->buildPostData($data);
@@ -257,7 +258,6 @@ class MultiCurl
$curl->setHeader('Content-Length', strlen($put_data));
}
$curl->setOpt(CURLOPT_POSTFIELDS, $put_data);
$this->queueHandle($curl);
return $curl;
}
@@ -277,6 +277,7 @@ class MultiCurl
$url = $this->baseUrl;
}
$curl = new Curl();
$this->queueHandle($curl);
$curl->setUrl($url);
$curl->setOpt(CURLOPT_CUSTOMREQUEST, 'SEARCH');
$put_data = $curl->buildPostData($data);
@@ -284,7 +285,6 @@ class MultiCurl
$curl->setHeader('Content-Length', strlen($put_data));
}
$curl->setOpt(CURLOPT_POSTFIELDS, $put_data);
$this->queueHandle($curl);
return $curl;
}
@@ -495,6 +495,7 @@ class MultiCurl
public function setHeader($key, $value)
{
$this->headers[$key] = $value;
$this->updateHeaders();
}
/**
@@ -510,6 +511,7 @@ class MultiCurl
foreach ($headers as $key => $value) {
$this->headers[$key] = $value;
}
$this->updateHeaders();
}
/**
@@ -783,6 +785,18 @@ class MultiCurl
$this->close();
}
/**
* Update Headers
*
* @access private
*/
private function updateHeaders()
{
foreach ($this->curls as $curl) {
$curl->setHeaders($this->headers);
}
}
/**
* Queue Handle
*
@@ -795,6 +809,8 @@ class MultiCurl
$curl->id = $this->nextCurlId++;
$curl->isChildOfMultiCurl = true;
$this->curls[$curl->id] = $curl;
$curl->setHeaders($this->headers);
}
/**
@@ -829,7 +845,6 @@ class MultiCurl
}
$curl->setOpts($this->options);
$curl->setHeaders($this->headers);
$curl->setRetry($this->retry);
$curl->setCookies($this->cookies);
tests/PHPCurlClass/PHPMultiCurlClassTest.php
+65
View File
@@ -2070,6 +2070,71 @@ class MultiCurlTest extends \PHPUnit\Framework\TestCase
$this->assertEquals('yummy', $get_2->responseCookies['mycookie']);
}
public function testJsonRequest()
{
foreach (array(
array(
array(
'key' => 'value',
),
'{"key":"value"}',
),
array(
array(
'key' => 'value',
'strings' => array(
'a',
'b',
'c',
),
),
'{"key":"value","strings":["a","b","c"]}',
),
) as $test) {
list($data, $expected_response) = $test;
$multi_curl = new MultiCurl();
$multi_curl->setHeader('X-DEBUG-TEST', 'post_json');
$multi_curl->complete(function ($instance) use ($expected_response, $data) {
\PHPUnit\Framework\Assert::assertEquals($expected_response, $instance->response);
});
$multi_curl->addPost(Test::TEST_URL, json_encode($data));
$multi_curl->start();
foreach (array(
'Content-Type',
'content-type',
'CONTENT-TYPE') as $key) {
foreach (array(
'APPLICATION/JSON',
'APPLICATION/JSON; CHARSET=UTF-8',
'APPLICATION/JSON;CHARSET=UTF-8',
'application/json',
'application/json; charset=utf-8',
'application/json;charset=UTF-8',
) as $value) {
$multi_curl = new MultiCurl();
$multi_curl->setHeader('X-DEBUG-TEST', 'post_json');
$multi_curl->setHeader($key, $value);
$multi_curl->complete(function ($instance) use ($expected_response, $data) {
\PHPUnit\Framework\Assert::assertEquals($expected_response, $instance->response);
});
$multi_curl->addPost(Test::TEST_URL, json_encode($data));
$multi_curl->start();
$multi_curl = new MultiCurl();
$multi_curl->setHeader('X-DEBUG-TEST', 'post_json');
$multi_curl->setHeader($key, $value);
$multi_curl->complete(function ($instance) use ($expected_response, $data) {
\PHPUnit\Framework\Assert::assertEquals($expected_response, $instance->response);
});
$multi_curl->addPost(Test::TEST_URL, $data);
$multi_curl->start();
}
}
}
}
public function testJsonDecoder()
{
$data = array(