mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
ENHANCEMENT you can now pass arbitrary CURL options to the request() method of RestfulService. (from r98656)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102770 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
55c4c90652
commit
f660634cc9
@ -101,7 +101,7 @@ class RestfulService extends ViewableData {
|
||||
*
|
||||
* This is a replacement of {@link connect()}.
|
||||
*/
|
||||
public function request($subURL = '', $method = "GET", $data = null, $headers = null) {
|
||||
public function request($subURL = '', $method = "GET", $data = null, $headers = null, $curlOptions = array()) {
|
||||
$url = $this->baseURL . $subURL; // Url for the request
|
||||
if($this->queryString) {
|
||||
if(strpos($url, '?') !== false) {
|
||||
@ -155,6 +155,9 @@ class RestfulService extends ViewableData {
|
||||
if(is_array($this->proxy)) {
|
||||
curl_setopt_array($ch, $this->proxy);
|
||||
}
|
||||
|
||||
// Set any custom options passed to the request() function
|
||||
curl_setopt_array($ch, $curlOptions);
|
||||
|
||||
// Run request
|
||||
curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
|
||||
|
Loading…
Reference in New Issue
Block a user