Skip to content

[BUGFIX] Use correct guzzle handler #24

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

Merged
bmack merged 1 commit into from
Nov 23, 2022
Merged

[BUGFIX] Use correct guzzle handler #24

Show file tree
Hide file tree
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
15 changes: 12 additions & 3 deletions Classes/Provider/CloudflareProxyProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
*/

use GuzzleHttp\Client;
use GuzzleHttp\HandlerStack;
use GuzzleHttp\Exception\TransferException;
use Psr\Log\LoggerAwareInterface;
use Psr\Log\LoggerAwareTrait;
Expand Down Expand Up @@ -178,9 +179,17 @@ protected function getClient(string $zoneId): Client
protected function initializeClient(string $zoneId, string $apiToken)
{
$httpOptions = $GLOBALS['TYPO3_CONF_VARS']['HTTP'];
if (isset($httpOptions['handler']) && empty($httpOptions['handler'])) {
// let guzzle choose hander
unset($httpOptions['handler']);
if (isset($httpOptions['handler'])) {
if (is_array($httpOptions['handler'] && !empty($httpOptions['handler']))) {
$stack = HandlerStack::create();
foreach ($httpOptions['handler'] as $handler) {
$stack->push($handler);
}
$httpOptions['handler'] = $stack;
}
else {
unset($httpOptions['handler']);
}
}
$httpOptions['base_uri'] = str_replace('{zoneId}', $zoneId, $this->baseUrl);
$httpOptions['headers']['Content-Type'] = 'application/json';
Expand Down
13 changes: 13 additions & 0 deletions Classes/Provider/FastlyProxyProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
*/

use GuzzleHttp\Client;
use GuzzleHttp\HandlerStack;

class FastlyProxyProvider implements ProxyProviderInterface
{
Expand Down Expand Up @@ -92,6 +93,18 @@ protected function getClient()
protected function initializeClient($serviceId, $apiToken)
{
$httpOptions = $GLOBALS['TYPO3_CONF_VARS']['HTTP'];
if (isset($httpOptions['handler'])) {
if (is_array($httpOptions['handler'] && !empty($httpOptions['handler']))) {
$stack = HandlerStack::create();
foreach ($httpOptions['handler'] as $handler) {
$stack->push($handler);
}
$httpOptions['handler'] = $stack;
}
else {
unset($httpOptions['handler']);
}
}
$httpOptions['verify'] = filter_var($httpOptions['verify'], FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE) ?? $httpOptions['verify'];
$httpOptions['base_uri'] = str_replace('{serviceId}', $serviceId, $this->baseUrl);
$httpOptions['headers']['Fastly-Key'] = $apiToken;
Expand Down