]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorStanislav Malyshev <stas@php.net>
Tue, 14 Oct 2014 07:43:15 +0000 (00:43 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 14 Oct 2014 07:43:15 +0000 (00:43 -0700)
* PHP-5.6:
  update NEWS and UPGRADING
  Upated NEWS
  Address issues raised by @nikic
  Make sure min < max
  Mersenne Twister was added in GMP 4.2
  Add test files
  Add gmp_random_bits(bits) and gmp_random_range(min, max)
  Change GMPs default PRNG to Mersenne Twister

Conflicts:
ext/gmp/gmp.c

1  2 
ext/gmp/gmp.c
ext/gmp/php_gmp.h

diff --cc ext/gmp/gmp.c
index b5c18ecb37add62cbb657eb256ea63ad889ff811,8aff2d6b23f77cda3712d4ee47b5676b257b0335..de294049c4a6e16d471d988a6dde64ac541cb09b
@@@ -1743,6 -1795,22 +1754,18 @@@ ZEND_FUNCTION(gmp_sign
  }
  /* }}} */
  
 -#if GMP_42_OR_NEWER
+ static void gmp_init_random(TSRMLS_D)
+ {
+       if (!GMPG(rand_initialized)) {
+               /* Initialize */
 -#else
 -              gmp_randinit_lc_2exp(GMPG(rand_state), 32L);
 -#endif
+               gmp_randinit_mt(GMPG(rand_state));
+               /* Seed */
+               gmp_randseed_ui(GMPG(rand_state), GENERATE_SEED());
+               GMPG(rand_initialized) = 1;
+       }
+ }
  /* {{{ proto GMP gmp_random([int limiter])
     Gets random number */
  ZEND_FUNCTION(gmp_random)
Simple merge