.../php-openid/Auth/Yadis/ParanoidHTTPFetcher.php | 27 ++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/typo3/sysext/openid/lib/php-openid/Auth/Yadis/ParanoidHTTPFetcher.php b/typo3/sysext/openid/lib/php-openid/Auth/Yadis/ParanoidHTTPFetcher.php
index 627ea9a..af5043e 100644
--- a/typo3/sysext/openid/lib/php-openid/Auth/Yadis/ParanoidHTTPFetcher.php
+++ b/typo3/sysext/openid/lib/php-openid/Auth/Yadis/ParanoidHTTPFetcher.php
@@ -153,6 +153,20 @@ class Auth_Yadis_ParanoidHTTPFetcher extends Auth_Yadis_HTTPFetcher {
if (defined('Auth_OpenID_HTTP_PROXY')) {
curl_setopt($c, CURLOPT_PROXY, Auth_OpenID_HTTP_PROXY);
}
+
+ //
+ if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyServer']) {
+ curl_setopt($c, CURLOPT_PROXY, $GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyServer']);
+
+ if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyTunnel']) {
+ curl_setopt($c, CURLOPT_HTTPPROXYTUNNEL, $GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyTunnel']);
+ }
+ if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyUserPass']) {
+ curl_setopt($c, CURLOPT_PROXYUSERPWD, $GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyUserPass']);
+ }
+ }
+ //
+
curl_exec($c);
$code = curl_getinfo($c, CURLINFO_HTTP_CODE);
@@ -216,6 +230,19 @@ class Auth_Yadis_ParanoidHTTPFetcher extends Auth_Yadis_HTTPFetcher {
curl_setopt($c, CURLOPT_PROXY, Auth_OpenID_HTTP_PROXY);
}
+ //
+ if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyServer']) {
+ curl_setopt($c, CURLOPT_PROXY, $GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyServer']);
+
+ if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyTunnel']) {
+ curl_setopt($c, CURLOPT_HTTPPROXYTUNNEL, $GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyTunnel']);
+ }
+ if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyUserPass']) {
+ curl_setopt($c, CURLOPT_PROXYUSERPWD, $GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyUserPass']);
+ }
+ }
+ //
+
curl_setopt($c, CURLOPT_POST, true);
curl_setopt($c, CURLOPT_POSTFIELDS, $body);
curl_setopt($c, CURLOPT_TIMEOUT, $this->timeout);
diff --git a/typo3/sysext/openid/lib/php-openid/Auth/OpenID/PredisStore.php b/typo3/sysext/openid/lib/php-openid/Auth/OpenID/PredisStore.php
index 14ecbbd..5b97335 100644
--- a/typo3/sysext/openid/lib/php-openid/Auth/OpenID/PredisStore.php
+++ b/typo3/sysext/openid/lib/php-openid/Auth/OpenID/PredisStore.php
@@ -45,7 +45,7 @@ class Auth_OpenID_PredisStore extends Auth_OpenID_OpenIDStore {
* @param \Predis\Client $redis Predis client object
* @param string $prefix Prefix for all keys stored to the Redis
*/
- function Auth_OpenID_PredisStore(\Predis\Client $redis, $prefix = '')
+ function Auth_OpenID_PredisStore($redis, $prefix = '')
{
$this->prefix = $prefix;
$this->redis = $redis;