Merge branch 'PHP-7.4'

Author: nikic

ext/standard/http_fopen_wrapper.c

@@ -86,11 +86,10 @@ static inline void strip_header(char *header_bag, char *lc_header_bag,
 		const char *lc_header_name)
 {
 	char *lc_header_start = strstr(lc_header_bag, lc_header_name);
-	char *header_start = header_bag + (lc_header_start - lc_header_bag);
-
 	if (lc_header_start
 	&& (lc_header_start == lc_header_bag || *(lc_header_start-1) == '\n')
 	) {
+		char *header_start = header_bag + (lc_header_start - lc_header_bag);
 		char *lc_eol = strchr(lc_header_start, '\n');
 		char *eol = header_start + (lc_eol - lc_header_start);
 

ext/standard/random.c

@@ -235,7 +235,7 @@ PHPAPI int php_random_int(zend_long min, zend_long max, zend_long *result, zend_
 		return SUCCESS;
 	}
 
-	umax = max - min;
+	umax = (zend_ulong) max - (zend_ulong) min;
 
 	if (php_random_bytes(&trial, sizeof(trial), should_throw) == FAILURE) {
 		return FAILURE;

ext/standard/tests/random/random_int.phpt

@@ -2,19 +2,22 @@
 Test normal operation of random_int()
 --FILE--
 <?php
-//-=-=-=-
 
 var_dump(is_int(random_int(10, 100)));
 
 $x = random_int(10, 100);
 var_dump($x >= 10 && $x <= 100);
 
 var_dump(random_int(-1000, -1) < 0);
+var_dump(random_int(-1, PHP_INT_MAX) >= -1);
+var_dump(is_int(random_int(PHP_INT_MIN, PHP_INT_MAX)));
 
 var_dump(random_int(42,42));
 
 ?>
---EXPECT--
+--EXPECTF--
+bool(true)
+bool(true)
 bool(true)
 bool(true)
 bool(true)