Skip to content

Guard curl connection sharing when CURL_LOCK_DATA_CONNECT is undefined #230

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

Open
plopesc wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Guard curl connection sharing when CURL_LOCK_DATA_CONNECT is undefined #230

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
9 changes: 7 additions & 2 deletions lib/ApiClient.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,10 @@ public function __construct(\CyberSource\Configuration $config = null, \CyberSou
echo "Merchant Configuration cannot be null.";
}

if (self::$shareHandle === null) {
// Connection sharing needs PHP built against libcurl >= 7.57.0, where
// CURL_LOCK_DATA_CONNECT exists. Older builds simply skip the share
// handle instead of failing with an undefined constant.
if (self::$shareHandle === null && defined('CURL_LOCK_DATA_CONNECT')) {
self::$shareHandle = curl_share_init();
curl_share_setopt(self::$shareHandle, CURLSHOPT_SHARE, CURL_LOCK_DATA_CONNECT);
}
Expand Down Expand Up @@ -318,7 +321,9 @@ public function callApi($resourcePath, $method, $queryParams, $postData, $header

$curl = curl_init();

curl_setopt($curl, CURLOPT_SHARE, self::$shareHandle);
if (self::$shareHandle !== null) {
curl_setopt($curl, CURLOPT_SHARE, self::$shareHandle);
}
// set timeout, if needed
if ($this->config->getCurlTimeout() !== 0) {
curl_setopt($curl, CURLOPT_TIMEOUT, $this->config->getCurlTimeout());
Expand Down