summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Watkins <krakjoe@php.net>2018-03-27 22:09:23 +0200
committerJoe Watkins <krakjoe@php.net>2018-03-27 22:09:42 +0200
commitfc6cbc3eaaa2204bace6eef1b95bd6fe7b146b67 (patch)
tree546fbc6288eb2146942fb5c5090002707849324e
parent3e267ca91bdde9430db3236602652c4fbf2580fa (diff)
parentac4d9fd0557cefe7a833bf1b0e97078010789a95 (diff)
downloadphp-git-fc6cbc3eaaa2204bace6eef1b95bd6fe7b146b67.tar.gz
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1: Fixed #75996: Add the right urls to the header of mt_rand.
-rw-r--r--NEWS3
-rw-r--r--ext/standard/mt_rand.c4
2 files changed, 4 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index d733efeb2a..ed7d417f21 100644
--- a/NEWS
+++ b/NEWS
@@ -25,8 +25,9 @@ PHP NEWS
. Fixed bug #76131 (mismatch arginfo for splarray constructor).
(carusogabriel)
-- Standard:
+- standard:
. Fixed bug #74139 (mail.add_x_header default inconsistent with docs). (cmb)
+ . Fixed bug #75996 (incorrect url in header for mt_rand). (tatarbj)
29 Mar 2018, PHP 7.2.4
diff --git a/ext/standard/mt_rand.c b/ext/standard/mt_rand.c
index 66065560f9..180d053c11 100644
--- a/ext/standard/mt_rand.c
+++ b/ext/standard/mt_rand.c
@@ -34,7 +34,7 @@
/*
The following php_mt_...() functions are based on a C++ class MTRand by
Richard J. Wagner. For more information see the web page at
- http://www-personal.engin.umich.edu/~wagnerr/MersenneTwister.html
+ http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/VERSIONS/C-LANG/MersenneTwister.h
Mersenne Twister random number generator -- a C++ class MTRand
Based on code by Makoto Matsumoto, Takuji Nishimura, and Shawn Cokus
@@ -45,7 +45,7 @@
The period, 2^19937-1, and the order of equidistribution, 623 dimensions,
are far greater. The generator is also fast; it avoids multiplication and
division, and it benefits from caches and pipelines. For more information
- see the inventors' web page at http://www.math.keio.ac.jp/~matumoto/emt.html
+ see the inventors' web page at http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/emt.html
Reference
M. Matsumoto and T. Nishimura, "Mersenne Twister: A 623-Dimensionally