Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix #78090: bug45161.phpt takes forever to finish

2 files changed, 10 insertions, 12 deletions

diff --git a/ext/curl/tests/bug45161.phpt b/ext/curl/tests/bug45161.phpt
index b93552e3ab..5b8fe0d46c 100644
--- a/ext/curl/tests/bug45161.phpt
+++ b/ext/curl/tests/bug45161.phpt
@@ -2,19 +2,16 @@
 Bug #45161 (Reusing a curl handle leaks memory)
 --SKIPIF--
 <?php
-if (substr(PHP_OS, 0, 3) == 'WIN') {
-	exit("skip not for Windows");
-}
-if (!extension_loaded("curl")) {
-	exit("skip curl extension not loaded");
-}
+include 'skipif.inc';
 ?>
 --FILE--
 <?php
+include 'server.inc';
+$host = curl_cli_server_start();
 
 // Fill memory for test
 $ch = curl_init();
-$fp = fopen('/dev/null', 'w');
+$fp = fopen(PHP_OS_FAMILY === 'Windows' ? 'nul' : '/dev/null', 'w');
 
 /*
 $i = $start = $end = 100000.00;
@@ -28,7 +25,7 @@ for ($i = 0; $i < 100; $i++) {
 // Start actual test
 $start = memory_get_usage() + 1024;
 for($i = 0; $i < 1024; $i++) {
-    curl_setopt($ch, CURLOPT_URL, 'http://127.0.0.1:9/');
+    curl_setopt($ch, CURLOPT_URL, "{$host}/get.inc");
     curl_setopt($ch, CURLOPT_FILE, $fp);
     curl_exec($ch);
 }
diff --git a/ext/curl/tests/bug46739.phpt b/ext/curl/tests/bug46739.phpt
index b7adc5662f..bf9a5c20d3 100644
--- a/ext/curl/tests/bug46739.phpt
+++ b/ext/curl/tests/bug46739.phpt
@@ -2,13 +2,14 @@
 Bug #46739 (array returned by curl_getinfo should contain content_type key)
 --SKIPIF--
 <?php
-if (!extension_loaded("curl")) {
-	exit("skip curl extension not loaded");
-}
+include 'skipif.inc';
 ?>
 --FILE--
 <?php
-$ch = curl_init('http://127.0.0.1:9/');
+include 'server.inc';
+$host = curl_cli_server_start();
+$ch = curl_init("{$host}/get.inc");
+curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
 
 curl_exec($ch);
 $info = curl_getinfo($ch);