garretts                                 Mon, 17 Aug 2009 21:28:22 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=287429

Log:
- Fix for bug #49223 Inconsistency using get_defined_constants(true)

Bug: http://bugs.php.net/49223 (Open) Inconsistency using 
get_defined_constants(true)
      
Changed paths:
    U   php/php-src/branches/PHP_5_3/ext/hash/hash.c
    U   php/php-src/trunk/ext/hash/hash.c

Modified: php/php-src/branches/PHP_5_3/ext/hash/hash.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/hash/hash.c        2009-08-17 20:38:54 UTC 
(rev 287428)
+++ php/php-src/branches/PHP_5_3/ext/hash/hash.c        2009-08-17 21:28:22 UTC 
(rev 287429)
@@ -643,8 +643,7 @@
                len = slprintf(buf, 127, "MHASH_%s", algorithm.mhash_name, 
strlen(algorithm.mhash_name));
                zend_register_long_constant(buf, len + 1, algorithm.value, 
CONST_CS | CONST_PERSISTENT, module_number TSRMLS_CC);
        }
-
-       zend_register_module_ex(&mhash_module_entry TSRMLS_CC);
+       zend_register_internal_module(&mhash_module_entry TSRMLS_CC);
 }

 /* {{{ proto string mhash(int hash, string data [, string key])

Modified: php/php-src/trunk/ext/hash/hash.c
===================================================================
--- php/php-src/trunk/ext/hash/hash.c   2009-08-17 20:38:54 UTC (rev 287428)
+++ php/php-src/trunk/ext/hash/hash.c   2009-08-17 21:28:22 UTC (rev 287429)
@@ -812,8 +812,7 @@
                len = slprintf(buf, 127, "MHASH_%s", algorithm.mhash_name, 
strlen(algorithm.mhash_name));
                zend_register_long_constant(buf, len + 1, algorithm.value, 
CONST_CS | CONST_PERSISTENT, module_number TSRMLS_CC);
        }
-
-       zend_register_module_ex(&mhash_module_entry TSRMLS_CC);
+       zend_register_internal_module(&mhash_module_entry TSRMLS_CC);
 }

 /* {{{ proto binary mhash(int hash, binary data [, binary key]) U

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

Reply via email to