From 147a31423219f4542b198aceae091dcd24ab0333 Mon Sep 17 00:00:00 2001
From: "Christoph M. Becker" <cmbecker69@gmx.de>
Date: Sat, 25 Dec 2021 23:59:29 +0100
Subject: [PATCH 1/2] Mark curl tests using http2.golang.org as XFAIL

http2.golang.org/serverpush has been retired[1], so we need to come up
with an alternative.  Until then, we mark the relevant tests as XFAIL
(although bug77535.phpt passes, what might be an indication that the
test needs further revision).

[1] <https://github.com/golang/go/issues/49301>
---
 ext/curl/tests/bug76675.phpt | 2 ++
 ext/curl/tests/bug77535.phpt | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/ext/curl/tests/bug76675.phpt b/ext/curl/tests/bug76675.phpt
index 5d36abfdd671b..2808ed09bc58a 100644
--- a/ext/curl/tests/bug76675.phpt
+++ b/ext/curl/tests/bug76675.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #76675 (Segfault with H2 server push write/writeheader handlers)
+--XFAIL--
+http2.golang.org/serverpush is gone
 --SKIPIF--
 <?php
 include 'skipif.inc';
diff --git a/ext/curl/tests/bug77535.phpt b/ext/curl/tests/bug77535.phpt
index b1d8f4d4da51a..605eec05d2cef 100644
--- a/ext/curl/tests/bug77535.phpt
+++ b/ext/curl/tests/bug77535.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #77535 (Invalid callback, h2 server push)
+--XFAIL--
+http2.golang.org/serverpush is gone
 --SKIPIF--
 <?php
 include 'skipif.inc';

From 7258de9d5220198951f34d99f72d648a08634d29 Mon Sep 17 00:00:00 2001
From: "Christoph M. Becker" <cmbecker69@gmx.de>
Date: Sun, 26 Dec 2021 13:48:26 +0100
Subject: [PATCH 2/2] Skip tests in addition to XFAILing them

---
 ext/curl/tests/bug76675.phpt | 1 +
 ext/curl/tests/bug77535.phpt | 1 +
 2 files changed, 2 insertions(+)

diff --git a/ext/curl/tests/bug76675.phpt b/ext/curl/tests/bug76675.phpt
index 2808ed09bc58a..c52874a6ed37d 100644
--- a/ext/curl/tests/bug76675.phpt
+++ b/ext/curl/tests/bug76675.phpt
@@ -12,6 +12,7 @@ $curl_version = curl_version();
 if ($curl_version['version_number'] < 0x073d00) {
     exit("skip: test may crash with curl < 7.61.0");
 }
+die("skip test is slow due to timeout, and XFAILs anyway");
 ?>
 --FILE--
 <?php
diff --git a/ext/curl/tests/bug77535.phpt b/ext/curl/tests/bug77535.phpt
index 605eec05d2cef..a5f6bb7503ff1 100644
--- a/ext/curl/tests/bug77535.phpt
+++ b/ext/curl/tests/bug77535.phpt
@@ -12,6 +12,7 @@ $curl_version = curl_version();
 if ($curl_version['version_number'] < 0x073d00) {
     exit("skip: test may crash with curl < 7.61.0");
 }
+die("skip test is slow due to timeout, and XFAILs anyway");
 ?>
 --FILE--
 <?php