tony2001 Tue, 08 Jun 2010 12:54:11 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=300272
Log: fix bug #51276 (php_load_extension() is missing when HAVE_LIBDL is undefined) Bug: http://bugs.php.net/51276 (Open) php_load_extension is called when HAVE_LIBDL is not defined. Changed paths: U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/main/php_ini.c U php/php-src/trunk/main/php_ini.c Modified: php/php-src/branches/PHP_5_3/NEWS =================================================================== --- php/php-src/branches/PHP_5_3/NEWS 2010-06-08 12:51:02 UTC (rev 300271) +++ php/php-src/branches/PHP_5_3/NEWS 2010-06-08 12:54:11 UTC (rev 300272) @@ -132,6 +132,8 @@ on). (Ilia, j dot jeising at gmail dot com) - Fixed bug #51291 (oci_error doesn't report last error when called two times) (Oracle Corp.) +- Fixed bug #51276 (php_load_extension() is missing when HAVE_LIBDL is undefined). + (Tony) - Fixed bug #51269 (zlib.output_compression Overwrites Vary Header). (Adam) - Fixed bug #51257 (CURL_VERSION_LARGEFILE incorrectly used after libcurl version 7.10.1). (aron dot ujvari at microsec dot hu) Modified: php/php-src/branches/PHP_5_3/main/php_ini.c =================================================================== --- php/php-src/branches/PHP_5_3/main/php_ini.c 2010-06-08 12:51:02 UTC (rev 300271) +++ php/php-src/branches/PHP_5_3/main/php_ini.c 2010-06-08 12:54:11 UTC (rev 300272) @@ -346,7 +346,9 @@ */ static void php_load_php_extension_cb(void *arg TSRMLS_DC) { +#ifdef HAVE_LIBDL php_load_extension(*((char **) arg), MODULE_PERSISTENT, 0 TSRMLS_CC); +#endif } /* }}} */ Modified: php/php-src/trunk/main/php_ini.c =================================================================== --- php/php-src/trunk/main/php_ini.c 2010-06-08 12:51:02 UTC (rev 300271) +++ php/php-src/trunk/main/php_ini.c 2010-06-08 12:54:11 UTC (rev 300272) @@ -346,7 +346,9 @@ */ static void php_load_php_extension_cb(void *arg TSRMLS_DC) { +#ifdef HAVE_LIBDL php_load_extension(*((char **) arg), MODULE_PERSISTENT, 0 TSRMLS_CC); +#endif } /* }}} */
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
