cvs: php-src /ext/standard dl.c dl.h /main php_ini.c /sapi/cli php_cli.c

sniper Mon Aug 8 12:49:45 2005 EDT Modified files: /php-src/ext/standard dl.c dl.h /php-src/main php_ini.c /php-src/sapi/cli php_cli.c Log: - Fixed problem with -dextension=foobar.so not having it's MINIT run. http://cvs.php.net/diff.php/php-src/ext/standard/dl.c?r1=1.105&r2=1.106&ty=u Index: php-src/ext/standard/dl.c diff -u php-src/ext/standard/dl.c:1.105 php-src/ext/standard/dl.c:1.106 --- php-src/ext/standard/dl.c:1.105 Wed Aug 3 10:07:58 2005 +++ php-src/ext/standard/dl.c Mon Aug 8 12:49:43 2005 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dl.c,v 1.105 2005/08/03 14:07:58 sniper Exp $ */ +/* $Id: dl.c,v 1.106 2005/08/08 16:49:43 sniper Exp $ */ #include "php.h" #include "dl.h" @@ -84,7 +84,7 @@ #endif } - php_dl(*file, MODULE_TEMPORARY, return_value TSRMLS_CC); + php_dl(*file, MODULE_TEMPORARY, return_value, 0 TSRMLS_CC); EG(full_tables_cleanup) = 1; } @@ -101,7 +101,7 @@ /* {{{ php_dl */ -void php_dl(zval *file, int type, zval *return_value TSRMLS_DC) +void php_dl(zval *file, int type, zval *return_value, int start_now TSRMLS_DC) { void *handle; char *libpath; @@ -223,12 +223,12 @@ RETURN_FALSE; } - if (type == MODULE_TEMPORARY && zend_startup_module_ex(module_entry TSRMLS_CC) == FAILURE) { + if ((type == MODULE_TEMPORARY || start_now) && zend_startup_module_ex(module_entry TSRMLS_CC) == FAILURE) { DL_UNLOAD(handle); RETURN_FALSE; } - if ((type == MODULE_TEMPORARY) && module_entry->request_startup_func) { + if ((type == MODULE_TEMPORARY || start_now) && module_entry->request_startup_func) { if (module_entry->request_startup_func(type, module_entry->module_number TSRMLS_CC) == FAILURE) { php_error_docref(NULL TSRMLS_CC, error_type, "Unable to initialize module '%s'", module_entry->name); DL_UNLOAD(handle); @@ -246,7 +246,7 @@ #else -void php_dl(zval *file, int type, zval *return_value TSRMLS_DC) +void php_dl(zval *file, int type, zval *return_value, int start_now TSRMLS_DC) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot dynamically load %s - dynamic modules are not supported", Z_STRVAL_P(file)); RETURN_FALSE; http://cvs.php.net/diff.php/php-src/ext/standard/dl.h?r1=1.22&r2=1.23&ty=u Index: php-src/ext/standard/dl.h diff -u php-src/ext/standard/dl.h:1.22 php-src/ext/standard/dl.h:1.23 --- php-src/ext/standard/dl.h:1.22 Wed Aug 3 10:07:58 2005 +++ php-src/ext/standard/dl.h Mon Aug 8 12:49:43 2005 @@ -18,12 +18,12 @@ +----------------------------------------------------------------------+ */ -/* $Id: dl.h,v 1.22 2005/08/03 14:07:58 sniper Exp $ */ +/* $Id: dl.h,v 1.23 2005/08/08 16:49:43 sniper Exp $ */ #ifndef DL_H #define DL_H -PHPAPI void php_dl(zval *file,int type, zval *return_value TSRMLS_DC); +PHPAPI void php_dl(zval *file,int type, zval *return_value, int start_now TSRMLS_DC); /* dynamic loading functions */ PHP_FUNCTION(dl); http://cvs.php.net/diff.php/php-src/main/php_ini.c?r1=1.135&r2=1.136&ty=u Index: php-src/main/php_ini.c diff -u php-src/main/php_ini.c:1.135 php-src/main/php_ini.c:1.136 --- php-src/main/php_ini.c:1.135 Wed Aug 3 10:08:34 2005 +++ php-src/main/php_ini.c Mon Aug 8 12:49:43 2005 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_ini.c,v 1.135 2005/08/03 14:08:34 sniper Exp $ */ +/* $Id: php_ini.c,v 1.136 2005/08/08 16:49:43 sniper Exp $ */ #include "php.h" #include "ext/standard/info.h" @@ -242,7 +242,7 @@ zval *extension = (zval *) arg; zval zval; - php_dl(extension, MODULE_PERSISTENT, &zval TSRMLS_CC); + php_dl(extension, MODULE_PERSISTENT, &zval, 0 TSRMLS_CC); } /* }}} */ http://cvs.php.net/diff.php/php-src/sapi/cli/php_cli.c?r1=1.128&r2=1.129&ty=u Index: php-src/sapi/cli/php_cli.c diff -u php-src/sapi/cli/php_cli.c:1.128 php-src/sapi/cli/php_cli.c:1.129 --- php-src/sapi/cli/php_cli.c:1.128 Mon Aug 8 04:45:33 2005 +++ php-src/sapi/cli/php_cli.c Mon Aug 8 12:49:44 2005 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_cli.c,v 1.128 2005/08/08 08:45:33 hholzgra Exp $ */ +/* $Id: php_cli.c,v 1.129 2005/08/08 16:49:44 sniper Exp $ */ #include "php.h" #include "php_globals.h" @@ -438,7 +438,7 @@ if (!strcasecmp(name, "extension")) { /* load function module */ zval extension, zval; ZVAL_STRING(&extension, value, 0); - php_dl(&extension, MODULE_TEMPORARY, &zval TSRMLS_CC); + php_dl(&extension, MODULE_PERSISTENT, &zval, 1 TSRMLS_CC); } else { zend_alter_ini_entry(name, strlen(name)+1, value, strlen(value), PHP_INI_SYSTEM, PHP_INI_STAGE_ACTIVATE); }