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

[Dmitry Stogov]

dmitry          Mon Jul 18 12:20:08 2005 EDT

  Modified files:              
    /php-src/main       main.c 
    /php-src/ext/standard       dl.c 
  Log:
  Fixed bug in new module statrup mechanism
  
  
http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.637&r2=1.638&ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.637 php-src/main/main.c:1.638
--- php-src/main/main.c:1.637   Sat Jul 16 08:21:34 2005
+++ php-src/main/main.c Mon Jul 18 12:20:07 2005
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: main.c,v 1.637 2005/07/16 12:21:34 hyanantha Exp $ */
+/* $Id: main.c,v 1.638 2005/07/18 16:20:07 dmitry Exp $ */
 
 /* {{{ includes
  */
@@ -1296,7 +1296,7 @@
 
        while (ptr < end) {
                if (*ptr) {
-                       if (zend_register_internal_module(*ptr 
TSRMLS_CC)==FAILURE) {
+                       if (zend_register_internal_module(*ptr 
TSRMLS_CC)==NULL) {
                                return FAILURE;
                        }
                }
http://cvs.php.net/diff.php/php-src/ext/standard/dl.c?r1=1.102&r2=1.103&ty=u
Index: php-src/ext/standard/dl.c
diff -u php-src/ext/standard/dl.c:1.102 php-src/ext/standard/dl.c:1.103
--- php-src/ext/standard/dl.c:1.102     Thu Jun 30 09:43:00 2005
+++ php-src/ext/standard/dl.c   Mon Jul 18 12:20:08 2005
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: dl.c,v 1.102 2005/06/30 13:43:00 dmitry Exp $ */
+/* $Id: dl.c,v 1.103 2005/07/18 16:20:08 dmitry Exp $ */
 
 #include "php.h"
 #include "dl.h"
@@ -219,7 +219,7 @@
        module_entry->module_number = zend_next_free_module();
        module_entry->handle = handle;
 
-       if (zend_register_module_ex(module_entry TSRMLS_CC) == FAILURE) {
+       if ((module_entry = zend_register_module_ex(module_entry TSRMLS_CC)) == 
NULL) {
                DL_UNLOAD(handle);
                RETURN_FALSE;
        }

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