Description: fixes call-time pass-by-reference
Bug-Debian: http://bugs.debian.org/653621
Forwarded: no
--- php-openid-2.2.2.orig/Auth/Yadis/XRDS.php
+++ php-openid-2.2.2/Auth/Yadis/XRDS.php
@@ -429,7 +429,7 @@ class Auth_Yadis_XRDS {
foreach ($filters as $filter) {
- if (call_user_func_array($filter, array(&$service))) {
+ if (call_user_func_array($filter, array($service))) {
$matches++;
if ($filter_mode == SERVICES_YADIS_MATCH_ANY) {
--- php-openid-2.2.2.orig/Auth/Yadis/Yadis.php
+++ php-openid-2.2.2/Auth/Yadis/Yadis.php
@@ -141,7 +141,7 @@ function Auth_Yadis_getServiceEndpoints(
}
$yadis_result = call_user_func_array($discover_func,
- array($input_url, &$fetcher));
+ array($input_url, $fetcher));
if ($yadis_result === null) {
return array($input_url, array());
--- php-openid-2.2.2.orig/Auth/Yadis/Manager.php
+++ php-openid-2.2.2/Auth/Yadis/Manager.php
@@ -413,7 +413,7 @@ class Auth_Yadis_Discovery {
list($yadis_url, $services) = call_user_func($discover_cb,
$this->url,
- &$fetcher);
+ $fetcher);
$manager = $this->createManager($services, $yadis_url);
}
--- php-openid-2.2.2.orig/Auth/OpenID/TrustRoot.php
+++ php-openid-2.2.2/Auth/OpenID/TrustRoot.php
@@ -413,7 +413,7 @@ function Auth_OpenID_getAllowedReturnURL
}
call_user_func_array($discover_function,
- array($relying_party_url, &$fetcher));
+ array($relying_party_url, $fetcher));
$return_to_urls = array();
$matching_endpoints = Auth_OpenID_extractReturnURL($endpoints);
--- php-openid-2.2.2.orig/Auth/OpenID/Consumer.php
+++ php-openid-2.2.2/Auth/OpenID/Consumer.php
@@ -666,7 +666,7 @@ class Auth_OpenID_GenericConsumer {
'_completeInvalid');
return call_user_func_array(array($this, $method),
- array($message, &$endpoint, $return_to));
+ array($message, $endpoint, $return_to));
}
/**
@@ -1181,7 +1181,7 @@ class Auth_OpenID_GenericConsumer {
// oidutil.log('Performing discovery on %s' % (claimed_id,))
list($unused, $services) = call_user_func($this->discoverMethod,
$claimed_id,
- &$this->fetcher);
+ $this->fetcher);
if (!$services) {
return new Auth_OpenID_FailureResponse(null,
--- php-openid-2.2.2.orig/Auth/OpenID/Server.php
+++ php-openid-2.2.2/Auth/OpenID/Server.php
@@ -1704,7 +1704,7 @@ class Auth_OpenID_Server {
{
if (method_exists($this, "openid_" . $request->mode)) {
$handler = array($this, "openid_" . $request->mode);
- return call_user_func($handler, &$request);
+ return call_user_func($handler, $request);
}
return null;
}