From a187a871ae7a22d3c87bbed187c99dec1c7c88ff Mon Sep 17 00:00:00 2001
From: "Christoph M. Becker" <cmbecker69@gmx.de>
Date: Mon, 3 Feb 2020 11:47:01 +0100
Subject: [PATCH 1/4] Fix #78090: test 3408/14609 of make test takes forever to
 finish

Not all systems support the discard protocol (TCP port 9), so we skip
this test, if the system does not.
---
 ext/curl/tests/bug45161.phpt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ext/curl/tests/bug45161.phpt b/ext/curl/tests/bug45161.phpt
index bf6f66977144c..baedf7c340e7d 100644
--- a/ext/curl/tests/bug45161.phpt
+++ b/ext/curl/tests/bug45161.phpt
@@ -12,6 +12,11 @@ $curl_version = curl_version();
 if ($curl_version['version_number'] < 0x071100) {
 	exit("skip: test works only with curl >= 7.17.0");
 }
+$socket = fsockopen('127.0.0.1', 9, $errno, $errstr, 1);
+if ($socket === false) {
+	exit("skip discard protocol unsupported");
+}
+fclose($socket);
 ?>
 --FILE--
 <?php

From 15ab79a031f52181652424dbd4c6fa74c257c08a Mon Sep 17 00:00:00 2001
From: "Christoph M. Becker" <cmbecker69@gmx.de>
Date: Mon, 3 Feb 2020 13:16:21 +0100
Subject: [PATCH 2/4] Fix SKIPIF clause

Apparently, connecting to port 9 is not supported (so the test is now
skipped on Travis).  Presumably, we have to check for a timeout.
---
 ext/curl/tests/bug45161.phpt | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ext/curl/tests/bug45161.phpt b/ext/curl/tests/bug45161.phpt
index baedf7c340e7d..30dab3f60a20f 100644
--- a/ext/curl/tests/bug45161.phpt
+++ b/ext/curl/tests/bug45161.phpt
@@ -12,11 +12,11 @@ $curl_version = curl_version();
 if ($curl_version['version_number'] < 0x071100) {
 	exit("skip: test works only with curl >= 7.17.0");
 }
-$socket = fsockopen('127.0.0.1', 9, $errno, $errstr, 1);
-if ($socket === false) {
-	exit("skip discard protocol unsupported");
-}
-fclose($socket);
+$ch = curl_init('http://127.0.0.1:9/');
+curl_exec($ch);
+if (curl_error() === CURLE_OPERATION_TIMEDOUT) {
+	die("skip discard protocol unsupported");
+} 
 ?>
 --FILE--
 <?php

From f68c603f9f76a8e219dab2becb8ea239d9ad4576 Mon Sep 17 00:00:00 2001
From: "Christoph M. Becker" <cmbecker69@gmx.de>
Date: Mon, 3 Feb 2020 14:43:00 +0100
Subject: [PATCH 3/4] Prefer actual server testing instead of relying on
 discard protocol

---
 ext/curl/tests/bug45161.phpt | 13 +++++--------
 ext/curl/tests/bug46739.phpt |  9 +++++----
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/ext/curl/tests/bug45161.phpt b/ext/curl/tests/bug45161.phpt
index 30dab3f60a20f..72eefa741fa23 100644
--- a/ext/curl/tests/bug45161.phpt
+++ b/ext/curl/tests/bug45161.phpt
@@ -2,12 +2,7 @@
 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';
 $curl_version = curl_version();
 if ($curl_version['version_number'] < 0x071100) {
 	exit("skip: test works only with curl >= 7.17.0");
@@ -20,10 +15,12 @@ if (curl_error() === CURLE_OPERATION_TIMEDOUT) {
 ?>
 --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;
@@ -37,7 +34,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 b7adc5662f973..bf9a5c20d346d 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);

From 6b9ab239a1760e46b8dc801d360ec6f0eec305d1 Mon Sep 17 00:00:00 2001
From: "Christoph M. Becker" <cmbecker69@gmx.de>
Date: Mon, 3 Feb 2020 23:04:15 +0100
Subject: [PATCH 4/4] Remove spurious skip clause

---
 ext/curl/tests/bug45161.phpt | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/ext/curl/tests/bug45161.phpt b/ext/curl/tests/bug45161.phpt
index 72eefa741fa23..d6d722fe281fa 100644
--- a/ext/curl/tests/bug45161.phpt
+++ b/ext/curl/tests/bug45161.phpt
@@ -7,11 +7,6 @@ $curl_version = curl_version();
 if ($curl_version['version_number'] < 0x071100) {
 	exit("skip: test works only with curl >= 7.17.0");
 }
-$ch = curl_init('http://127.0.0.1:9/');
-curl_exec($ch);
-if (curl_error() === CURLE_OPERATION_TIMEDOUT) {
-	die("skip discard protocol unsupported");
-} 
 ?>
 --FILE--
 <?php