From fbccd1438c2fa0bd2c0a2e46c4e421a2436b9254 Mon Sep 17 00:00:00 2001 From: Wez Furlong Date: Fri, 21 May 2004 17:08:36 +0000 Subject: [PATCH] Update to reflect recent changes in dl() --- ext/standard/dl.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/ext/standard/dl.c b/ext/standard/dl.c index 87c63aa91a..0b13085ed1 100644 --- a/ext/standard/dl.c +++ b/ext/standard/dl.c @@ -236,22 +236,11 @@ void php_dl(pval *file, int type, pval *return_value TSRMLS_DC) } module_entry->type = type; module_entry->module_number = zend_next_free_module(); - zend_register_module_ex(module_entry TSRMLS_CC); - - if ((type == MODULE_TEMPORARY) && module_entry->request_startup_func) { - if (module_entry->request_startup_func(type, module_entry->module_number TSRMLS_CC)) { - php_error_docref(NULL TSRMLS_CC, error_type, "Unable to initialize module '%s'", module_entry->name); - DL_UNLOAD(handle); - RETURN_FALSE; - } - } - /* update the .request_started property... */ - if (zend_hash_find(&module_registry, module_entry->name, strlen(module_entry->name)+1, (void **) &tmp)==FAILURE) { - php_error_docref(NULL TSRMLS_CC, error_type, "Loaded module '%s' got lost", module_entry->name); + if (zend_register_module_ex(module_entry TSRMLS_CC) == FAILURE) { + DL_UNLOAD(handle); RETURN_FALSE; } - tmp->handle = handle; RETURN_TRUE; } -- 2.50.1