From 8e97bfd8ac73e232a82bc116c105843498acb3b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= Date: Tue, 6 Feb 2024 14:55:29 +0100 Subject: [PATCH] ext/curl: allow changing Caddy port for Server Push tests --- ext/curl/tests/Caddyfile | 14 +++++++------- ext/curl/tests/bug76675.phpt | 2 +- ext/curl/tests/bug77535.phpt | 2 +- ext/curl/tests/curl_pushfunction.phpt | 2 +- .../curl_pushfunction_nonexistent_callback.phpt | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ext/curl/tests/Caddyfile b/ext/curl/tests/Caddyfile index 28deb40926fc0..b1e6be2955a24 100644 --- a/ext/curl/tests/Caddyfile +++ b/ext/curl/tests/Caddyfile @@ -3,11 +3,11 @@ auto_https disable_redirects } -localhost +{$SERVER_NAME:https://localhost} { + respond / "Caddy is up and running" -respond / "Caddy is up and running" - -# HTTP/2 Server Push -respond /serverpush "main response" -respond /serverpush/pushed "pushed response" -push /serverpush /serverpush/pushed + # HTTP/2 Server Push + respond /serverpush "main response" + respond /serverpush/pushed "pushed response" + push /serverpush /serverpush/pushed +} diff --git a/ext/curl/tests/bug76675.phpt b/ext/curl/tests/bug76675.phpt index af624f462a69d..20794b98f8129 100644 --- a/ext/curl/tests/bug76675.phpt +++ b/ext/curl/tests/bug76675.phpt @@ -26,7 +26,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://localhost/serverpush'); +curl_setopt($ch, CURLOPT_URL, (getenv('SERVER_NAME') ?: 'https://localhost') . '/serverpush'); curl_setopt($ch, CURLOPT_HTTP_VERSION, 3); curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0); curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0); diff --git a/ext/curl/tests/bug77535.phpt b/ext/curl/tests/bug77535.phpt index 3698c9a51dc9d..0f0a0020c0e42 100644 --- a/ext/curl/tests/bug77535.phpt +++ b/ext/curl/tests/bug77535.phpt @@ -32,7 +32,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://localhost/serverpush'); + curl_setopt($this->curl, CURLOPT_URL, (getenv('SERVER_NAME') ?: '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); diff --git a/ext/curl/tests/curl_pushfunction.phpt b/ext/curl/tests/curl_pushfunction.phpt index 3b43dee4e25c6..ac9744a1e339d 100644 --- a/ext/curl/tests/curl_pushfunction.phpt +++ b/ext/curl/tests/curl_pushfunction.phpt @@ -26,7 +26,7 @@ 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_URL, (getenv('SERVER_NAME') ?: 'https://localhost') . '/serverpush'); curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_2_0); curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); diff --git a/ext/curl/tests/curl_pushfunction_nonexistent_callback.phpt b/ext/curl/tests/curl_pushfunction_nonexistent_callback.phpt index fe2defa5eea08..35ad136402627 100644 --- a/ext/curl/tests/curl_pushfunction_nonexistent_callback.phpt +++ b/ext/curl/tests/curl_pushfunction_nonexistent_callback.phpt @@ -25,7 +25,7 @@ curl_multi_setopt($mh, CURLMOPT_PIPELINING, CURLPIPE_MULTIPLEX); curl_multi_setopt($mh, CURLMOPT_PUSHFUNCTION, "nonexistent"); $ch = curl_init(); -curl_setopt($ch, CURLOPT_URL, "https://localhost/serverpush"); +curl_setopt($ch, CURLOPT_URL, (getenv('SERVER_NAME') ?: 'https://localhost') . '/serverpush'); curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_2_0); curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);