Merge branch 'PHP-7.0' into PHP-7.1

nikic · nikic · commit aab3f784d0cb · 2017-01-09T23:29:33.000+01:00
diff --git a/ext/standard/config.m4 b/ext/standard/config.m4
@@ -546,11 +546,6 @@ dnl Check for arc4random on BSD systems
 dnl
 AC_CHECK_DECLS([arc4random_buf])
 
-dnl
-dnl Check for getrandom on newer Linux kernels
-dnl
-AC_CHECK_DECLS([getrandom])
-
 dnl
 dnl Setup extension sources
 dnl
diff --git a/ext/standard/random.c b/ext/standard/random.c
@@ -93,7 +93,7 @@ PHPAPI int php_random_bytes(void *bytes, size_t size, zend_bool should_throw)
 	}
 #elif HAVE_DECL_ARC4RANDOM_BUF && ((defined(__OpenBSD__) && OpenBSD >= 201405) || (defined(__NetBSD__) && __NetBSD_Version__ >= 700000001))
 	arc4random_buf(bytes, size);
-#elif HAVE_DECL_GETRANDOM
+#elif defined(__linux__) && defined(SYS_getrandom)
 	/* Linux getrandom(2) syscall */
 	size_t read_bytes = 0;
 	size_t amount_to_read = 0;

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ PHPAPI int php_random_bytes(void *bytes, size_t size, zend_bool should_throw)`
`93`	`93`	`}`
`94`	`94`	`#elif HAVE_DECL_ARC4RANDOM_BUF && ((defined(__OpenBSD__) && OpenBSD >= 201405) \|\| (defined(__NetBSD__) && __NetBSD_Version__ >= 700000001))`
`95`	`95`	`arc4random_buf(bytes, size);`
`96`		`-#elif HAVE_DECL_GETRANDOM`
	`96`	`+#elif defined(__linux__) && defined(SYS_getrandom)`
`97`	`97`	`/* Linux getrandom(2) syscall */`
`98`	`98`	`size_t read_bytes = 0;`
`99`	`99`	`size_t amount_to_read = 0;`