From: Stanislav Malyshev <stas@php.net>
Date: Tue, 14 Oct 2014 07:43:15 +0000 (-0700)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: POST_NATIVE_TLS_MERGE^2~73^2~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=afdaedaa268197631e210772609fd1f7928f9973;p=php

Merge branch 'PHP-5.6'

* 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
---

afdaedaa268197631e210772609fd1f7928f9973
diff --cc ext/gmp/gmp.c
index b5c18ecb37,8aff2d6b23..de294049c4
--- a/ext/gmp/gmp.c
+++ b/ext/gmp/gmp.c
@@@ -1743,6 -1795,22 +1754,18 @@@ ZEND_FUNCTION(gmp_sign
  }
  /* }}} */
  
+ static void gmp_init_random(TSRMLS_D)
+ {
+ 	if (!GMPG(rand_initialized)) {
+ 		/* Initialize */
 -#if GMP_42_OR_NEWER
+ 		gmp_randinit_mt(GMPG(rand_state));
 -#else
 -		gmp_randinit_lc_2exp(GMPG(rand_state), 32L);
 -#endif
+ 		/* 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)