File tree Expand file tree Collapse file tree 2 files changed +1
-19
lines changed Expand file tree Collapse file tree 2 files changed +1
-19
lines changed Original file line number Diff line number Diff line change @@ -657,18 +657,7 @@ PHP_FUNCTION(spl_object_id)
657
657
658
658
PHPAPI zend_string * php_spl_object_hash (zend_object * obj ) /* {{{*/
659
659
{
660
- intptr_t hash_handle , hash_handlers ;
661
-
662
- if (!SPL_G (hash_mask_init )) {
663
- SPL_G (hash_mask_handle ) = (intptr_t )(php_mt_rand () >> 1 );
664
- SPL_G (hash_mask_handlers ) = (intptr_t )(php_mt_rand () >> 1 );
665
- SPL_G (hash_mask_init ) = 1 ;
666
- }
667
-
668
- hash_handle = SPL_G (hash_mask_handle )^(intptr_t )obj -> handle ;
669
- hash_handlers = SPL_G (hash_mask_handlers );
670
-
671
- return strpprintf (32 , "%016zx%016zx" , hash_handle , hash_handlers );
660
+ return strpprintf (32 , "%016zx0000000000000000" , (intptr_t )obj -> handle );
672
661
}
673
662
/* }}} */
674
663
@@ -736,7 +725,6 @@ PHP_RINIT_FUNCTION(spl) /* {{{ */
736
725
{
737
726
SPL_G (autoload_extensions ) = NULL ;
738
727
SPL_G (autoload_functions ) = NULL ;
739
- SPL_G (hash_mask_init ) = 0 ;
740
728
return SUCCESS ;
741
729
} /* }}} */
742
730
@@ -751,9 +739,6 @@ PHP_RSHUTDOWN_FUNCTION(spl) /* {{{ */
751
739
FREE_HASHTABLE (SPL_G (autoload_functions ));
752
740
SPL_G (autoload_functions ) = NULL ;
753
741
}
754
- if (SPL_G (hash_mask_init )) {
755
- SPL_G (hash_mask_init ) = 0 ;
756
- }
757
742
return SUCCESS ;
758
743
} /* }}} */
759
744
Original file line number Diff line number Diff line change @@ -54,9 +54,6 @@ PHP_MINFO_FUNCTION(spl);
54
54
ZEND_BEGIN_MODULE_GLOBALS (spl )
55
55
zend_string * autoload_extensions ;
56
56
HashTable * autoload_functions ;
57
- intptr_t hash_mask_handle ;
58
- intptr_t hash_mask_handlers ;
59
- int hash_mask_init ;
60
57
ZEND_END_MODULE_GLOBALS (spl )
61
58
62
59
ZEND_EXTERN_MODULE_GLOBALS (spl )
You can’t perform that action at this time.
0 commit comments