We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit 8ab40e70 authored by Brion Vibber's avatar Brion Vibber

Cleanup for bug 1813: workaround sometimes-missing dl() in PHP 5.3 by defining...

Cleanup for bug 1813: workaround sometimes-missing dl() in PHP 5.3 by defining our own bogus function rather than attempting to patch upstream libs. This keeps our fix across upstream versions (or when loading upstream library from outside extlib)

Note that fixes to OpenID libraries in commit fe9473ac were lost in just such an update.
parent 6f9b9092
......@@ -746,7 +746,7 @@ class PEAR
{
if (!extension_loaded($ext)) {
// if either returns true dl() will produce a FATAL error, stop that
if ((ini_get('enable_dl') != 1) || (ini_get('safe_mode') == 1) || !function_exists('dl')) {
if ((ini_get('enable_dl') != 1) || (ini_get('safe_mode') == 1)) {
return false;
}
if (OS_WINDOWS) {
......
......@@ -45,6 +45,14 @@ define('FOREIGN_FRIEND_RECV', 2);
set_include_path(get_include_path() . PATH_SEPARATOR . INSTALLDIR . '/extlib/');
# To protect against upstream libraries which haven't updated
# for PHP 5.3 where dl() function may not be present...
if (!function_exists('dl')) {
function dl($library) {
return false;
}
}
# global configuration object
require_once('PEAR.php');
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment