drop INI directive. if exceeded, always truncate.

Author: zeriyoshi

ext/standard/basic_functions.c

@@ -568,7 +568,6 @@ PHP_MINFO_FUNCTION(basic) /* {{{ */
 	BASIC_MINFO_SUBMODULE(mail)
 	php_info_print_table_end();
 	BASIC_MINFO_SUBMODULE(assert)
-	BASIC_MINFO_SUBMODULE(random_class)
 }
 /* }}} */
 

ext/standard/php_random_class.h

@@ -19,7 +19,6 @@
 
 PHP_MINIT_FUNCTION(random_class);
 PHP_MSHUTDOWN_FUNCTION(random_class);
-PHP_MINFO_FUNCTION(random_class);
 
 extern PHPAPI zend_class_entry *php_random_class_ce_RandomNumberGenerator;
 extern PHPAPI zend_class_entry *php_random_class_ce_Random;

ext/standard/random_class.c

@@ -539,12 +539,6 @@ const php_random_class_algo php_random_class_algo_secure = {
 };
 /* secure END */
 
-/* {{{ PHP_INI */
-PHP_INI_BEGIN()
-	STD_PHP_INI_BOOLEAN("random.ignore_generated_size_exceeded", "0", PHP_INI_ALL, OnUpdateBool, random_class_ignore_generated_size_exceeded, php_core_globals, core_globals)
-PHP_INI_END()
-/* }}} */
-
 /* {{{ */
 PHP_METHOD(Random, getAlgos)
 {
@@ -653,12 +647,8 @@ PHP_METHOD(Random, nextInt)
 	ret = php_random_class_next(random_class);
 	if (random_class->algo) {
 		if (random_class->algo->generate_size > sizeof(zend_long)) {
-			if (PG(random_class_ignore_generated_size_exceeded)) {
-				ret = (zend_ulong) ret;
-			} else {
-				zend_throw_exception(NULL, "Generated random number size exceeded", 0);
-				RETURN_THROWS();
-			}
+			/* truncate */
+			ret = (zend_ulong) ret;
 		}
 		/* right shift for future machine compatibility. */
 		ret = ret >> 1;
@@ -845,8 +835,6 @@ PHP_METHOD(Random, __unserialize)
 
 PHP_MINIT_FUNCTION(random_class)
 {
-	REGISTER_INI_ENTRIES();
-
 	zend_hash_init(&php_random_class_algos, 1, NULL, ZVAL_PTR_DTOR, 1);
 
 	/* algo: XorShift128+ */
@@ -878,13 +866,6 @@ PHP_MINIT_FUNCTION(random_class)
 
 PHP_MSHUTDOWN_FUNCTION(random_class)
 {
-	UNREGISTER_INI_ENTRIES();
-
 	zend_hash_destroy(&php_random_class_algos);
 	return SUCCESS;
 }
-
-PHP_MINFO_FUNCTION(random_class)
-{
-	DISPLAY_INI_ENTRIES();
-}

ext/standard/tests/random_class/random_class_clone.phpt

@@ -1,7 +1,5 @@
 --TEST--
 Test Random class clone
---INI--
-random.ignore_generated_size_exceeded=1
 --FILE--
 <?php
 

ext/standard/tests/random_class/random_class_method_nextInt.phpt

@@ -1,7 +1,5 @@
 --TEST--
 Test Random::nextInt()
---INI--
-random.ignore_generated_size_exceeded=1
 --FILE--
 <?php
 

ext/standard/tests/random_class/random_class_result_xorshift128plus_32.phpt

@@ -6,8 +6,6 @@ if (PHP_INT_SIZE >= 8) {
     echo 'skip this test only available on 32bit enviroment.';
 }
 ?>
---INI--
-random.ignore_generated_size_exceeded=1
 --FILE--
 <?php
 

ext/standard/tests/random_class/random_class_serialize.phpt

@@ -1,7 +1,5 @@
 --TEST--
 Test Random class serialize / unserialize
---INI--
-random.ignore_generated_size_exceeded=1
 --FILE--
 <?php
 

main/php_globals.h

@@ -165,8 +165,6 @@ struct _php_core_globals {
 	char *syslog_ident;
 	bool have_called_openlog;
 	zend_long syslog_filter;
-
-	bool random_class_ignore_generated_size_exceeded;
 };