[PHP-CVS] cvs: php-src /ext/standard dl.c

[Wez Furlong]

wez             Fri May 21 13:08:36 2004 EDT

  Modified files:              
    /php-src/ext/standard       dl.c 
  Log:
  Update to reflect recent changes in dl()
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/dl.c?r1=1.91&r2=1.92&ty=u
Index: php-src/ext/standard/dl.c
diff -u php-src/ext/standard/dl.c:1.91 php-src/ext/standard/dl.c:1.92
--- php-src/ext/standard/dl.c:1.91      Tue May 18 12:13:57 2004
+++ php-src/ext/standard/dl.c   Fri May 21 13:08:36 2004
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: dl.c,v 1.91 2004/05/18 16:13:57 stas Exp $ */
+/* $Id: dl.c,v 1.92 2004/05/21 17:08:36 wez Exp $ */
 
 #include "php.h"
 #include "dl.h"
@@ -236,22 +236,11 @@
        }
        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;
 }

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php