tests(ext-curl): fix HTTP/2 Server Push tests

Author: dunglas

.github/actions/setup-caddy/action.yml

@@ -0,0 +1,13 @@
+name: Setup Caddy server
+runs:
+  using: composite
+  steps:
+    - shell: bash
+      run: |
+        sudo apt-get install -y debian-keyring debian-archive-keyring apt-transport-https
+        curl -1sLf 'https://dl.cloudsmith.io/public/caddy/stable/gpg.key' | sudo gpg --dearmor -o /usr/share/keyrings/caddy-stable-archive-keyring.gpg
+        curl -1sLf 'https://dl.cloudsmith.io/public/caddy/stable/debian.deb.txt' | sudo tee /etc/apt/sources.list.d/caddy-stable.list
+        sudo apt-get update
+        sudo apt-get install -y caddy
+
+        sudo caddy start --config ext/curl/tests/Caddyfile

.github/workflows/push.yml

@@ -39,6 +39,8 @@ jobs:
         uses: ./.github/actions/setup-mssql
       - name: Create Oracle container
         uses: ./.github/actions/setup-oracle
+      - name: Setup Caddy server
+        uses: ./.github/actions/setup-caddy
       - name: apt
         uses: ./.github/actions/apt-x64
       - name: ccache
@@ -63,13 +65,17 @@ jobs:
         uses: ./.github/actions/setup-x64
       - name: Test
         uses: ./.github/actions/test-linux
+        env:
+          RUN_CADDY_TESTS: "1"
       - name: Test Tracing JIT
         uses: ./.github/actions/test-linux
         with:
           runTestsParameters: >-
             -d zend_extension=opcache.so
             -d opcache.enable_cli=1
             -d opcache.jit_buffer_size=16M
+        env:
+          RUN_CADDY_TESTS: "1"
       - name: Verify generated files are up to date
         uses: ./.github/actions/verify-generated-files
   LINUX_X32:

ext/curl/tests/Caddyfile

@@ -0,0 +1,11 @@
+{
+    admin off
+    auto_https disable_redirects
+}
+
+localhost
+
+# HTTP/2 Server Push
+respond /serverpush "main response"
+respond /serverpush/pushed "pushed response"
+push /serverpush /serverpush/pushed

ext/curl/tests/bug76675.phpt

@@ -2,18 +2,18 @@
 Bug #76675 (Segfault with H2 server push write/writeheader handlers)
 --EXTENSIONS--
 curl
---XFAIL--
-http2.golang.org/serverpush is gone
 --SKIPIF--
 <?php
+if (!getenv("RUN_CADDY_TESTS")) {
+    die("skip test needing Caddy");
+}
 if (getenv("SKIP_ONLINE_TESTS")) {
     die("skip online test");
 }
 $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
@@ -30,7 +30,7 @@ $mh = curl_multi_init();
 curl_multi_setopt($mh, CURLMOPT_PIPELINING, CURLPIPE_MULTIPLEX);
 curl_multi_setopt($mh, CURLMOPT_PUSHFUNCTION, $callback);
 $ch = curl_init();
-curl_setopt($ch, CURLOPT_URL, 'https://http2.golang.org/serverpush');
+curl_setopt($ch, CURLOPT_URL, 'https://localhost/serverpush');
 curl_setopt($ch, CURLOPT_HTTP_VERSION, 3);
 curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);
 curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);

ext/curl/tests/bug77535.phpt

@@ -2,18 +2,18 @@
 Bug #77535 (Invalid callback, h2 server push)
 --EXTENSIONS--
 curl
---XFAIL--
-http2.golang.org/serverpush is gone
 --SKIPIF--
 <?php
+if (!getenv("RUN_CADDY_TESTS")) {
+    die("skip test needing Caddy");
+}
 if (getenv("SKIP_ONLINE_TESTS")) {
     die("skip online test");
 }
 $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
@@ -36,7 +36,7 @@ class MyHttpClient
         curl_setopt($this->curl, CURLOPT_HEADER, false);
         curl_setopt($this->curl, CURLOPT_RETURNTRANSFER, false);
         curl_setopt($this->curl, CURLOPT_FAILONERROR, false);
-        curl_setopt($this->curl, CURLOPT_URL, 'https://http2.golang.org/serverpush');
+        curl_setopt($this->curl, CURLOPT_URL, 'https://localhost/serverpush');
         curl_setopt($this->curl, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_2_0);
         curl_setopt($this->curl, CURLOPT_HEADERFUNCTION, function ($ch, $data) {
             return \strlen($data);

ext/curl/tests/curl_pushfunction.phpt

@@ -0,0 +1,64 @@
+--TEST--
+Test CURLMOPT_PUSHFUNCTION
+--EXTENSIONS--
+curl
+--SKIPIF--
+<?php
+if (!getenv("RUN_CADDY_TESTS")) {
+    die("skip test needing Caddy");
+}
+if (getenv("SKIP_ONLINE_TESTS")) {
+    die("skip online test");
+}
+$curl_version = curl_version();
+if ($curl_version['version_number'] < 0x073d00) {
+    exit("skip: test may crash with curl < 7.61.0");
+}
+?>
+--FILE--
+<?php
+$callback = function($parent_ch, $pushed_ch, array $headers) use (&$transfers) {
+	return CURL_PUSH_OK;
+};
+
+$mh = curl_multi_init();
+
+curl_multi_setopt($mh, CURLMOPT_PIPELINING, CURLPIPE_MULTIPLEX);
+curl_multi_setopt($mh, CURLMOPT_PUSHFUNCTION, $callback);
+
+$ch = curl_init();
+curl_setopt($ch, CURLOPT_URL, "https://localhost/serverpush");
+curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_2_0);
+curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+
+curl_multi_add_handle($mh, $ch);
+
+$responses = [];
+$active = null;
+do {
+    $status = curl_multi_exec($mh, $active);
+
+    do {
+        $info = curl_multi_info_read($mh);
+        if (false !== $info && $info['msg'] == CURLMSG_DONE) {
+            $handle = $info['handle'];
+            if ($handle !== null) {
+                $transfers--;
+		        $responses[] = curl_multi_getcontent($info['handle']);
+                curl_multi_remove_handle($mh, $handle);
+                curl_close($handle);
+            }
+        }
+    } while ($info);
+} while (count($responses) !== 2);
+
+curl_multi_close($mh);
+
+sort($responses);
+print_r($responses);
+--EXPECT--
+Array
+(
+    [0] => main response
+    [1] => pushed response
+)