From dce6c3c92dcd8a55f9e6841bae96948ebcccca2d Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Fri, 27 Sep 2024 13:40:40 +0200 Subject: [PATCH 1/3] Fix failing soap tests on Windows These failures are caused by the fix for GHSA-p99j-rfp4-xqvq. Since the two bug*.phpt tests don't need the "wsdl" query string, we use a `--CGI--` section instead. The two server*.phpt tests are harder to fix, since during evaluation of the `--SKIPIF--` section, the soap extension can be loaded, but it may not during evaluation of the `--FILE--` section. So for now, we skip these tests on Windows altogether. --- ext/soap/tests/bugs/bug27722.phpt | 3 +-- ext/soap/tests/bugs/bug27742.phpt | 3 +-- ext/soap/tests/server011.phpt | 6 ++++++ ext/soap/tests/server012.phpt | 6 ++++++ 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ext/soap/tests/bugs/bug27722.phpt b/ext/soap/tests/bugs/bug27722.phpt index 3315b71401840..9e4a42c0dea3d 100644 --- a/ext/soap/tests/bugs/bug27722.phpt +++ b/ext/soap/tests/bugs/bug27722.phpt @@ -2,8 +2,7 @@ Bug #27722 (Segfault on schema without targetNamespace) --EXTENSIONS-- soap ---GET-- -wsdl +--CGI-- --INI-- soap.wsdl_cache_enabled=0 --FILE-- diff --git a/ext/soap/tests/bugs/bug27742.phpt b/ext/soap/tests/bugs/bug27742.phpt index 02b27dc0144ec..45248623af3f1 100644 --- a/ext/soap/tests/bugs/bug27742.phpt +++ b/ext/soap/tests/bugs/bug27742.phpt @@ -2,8 +2,7 @@ Bug #27742 (WDSL SOAP Parsing Schema bug) --EXTENSIONS-- soap ---GET-- -wsdl +--CGI-- --INI-- soap.wsdl_cache_enabled=0 --FILE-- diff --git a/ext/soap/tests/server011.phpt b/ext/soap/tests/server011.phpt index ad4a626c79016..1e83093bfb5b4 100644 --- a/ext/soap/tests/server011.phpt +++ b/ext/soap/tests/server011.phpt @@ -1,5 +1,11 @@ --TEST-- SOAP Server 11: bind +--SKIPIF-- + --EXTENSIONS-- soap --GET-- diff --git a/ext/soap/tests/server012.phpt b/ext/soap/tests/server012.phpt index 230108e2b9202..9740d02614bf0 100644 --- a/ext/soap/tests/server012.phpt +++ b/ext/soap/tests/server012.phpt @@ -1,5 +1,11 @@ --TEST-- SOAP Server 12: WSDL generation +--SKIPIF-- + --EXTENSIONS-- soap --GET-- From 70fc1bf920bac86cc16e24fd031b705c445224d0 Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Fri, 27 Sep 2024 19:06:24 +0200 Subject: [PATCH 2/3] bug*.phpt don't need php-cgi --- ext/soap/tests/bugs/bug27722.phpt | 1 - ext/soap/tests/bugs/bug27742.phpt | 1 - 2 files changed, 2 deletions(-) diff --git a/ext/soap/tests/bugs/bug27722.phpt b/ext/soap/tests/bugs/bug27722.phpt index 9e4a42c0dea3d..1bfc2fe6ee3b4 100644 --- a/ext/soap/tests/bugs/bug27722.phpt +++ b/ext/soap/tests/bugs/bug27722.phpt @@ -2,7 +2,6 @@ Bug #27722 (Segfault on schema without targetNamespace) --EXTENSIONS-- soap ---CGI-- --INI-- soap.wsdl_cache_enabled=0 --FILE-- diff --git a/ext/soap/tests/bugs/bug27742.phpt b/ext/soap/tests/bugs/bug27742.phpt index 45248623af3f1..1c7c8fc09f7e4 100644 --- a/ext/soap/tests/bugs/bug27742.phpt +++ b/ext/soap/tests/bugs/bug27742.phpt @@ -2,7 +2,6 @@ Bug #27742 (WDSL SOAP Parsing Schema bug) --EXTENSIONS-- soap ---CGI-- --INI-- soap.wsdl_cache_enabled=0 --FILE-- From 8e99f27d1840b0de4f487b9b956e96c6df5f772a Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Fri, 27 Sep 2024 19:08:13 +0200 Subject: [PATCH 3/3] Fix skip message Thanks to @nielsdos! --- ext/soap/tests/server011.phpt | 2 +- ext/soap/tests/server012.phpt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/soap/tests/server011.phpt b/ext/soap/tests/server011.phpt index 1e83093bfb5b4..f236ec3affc59 100644 --- a/ext/soap/tests/server011.phpt +++ b/ext/soap/tests/server011.phpt @@ -3,7 +3,7 @@ SOAP Server 11: bind --SKIPIF-- --EXTENSIONS-- diff --git a/ext/soap/tests/server012.phpt b/ext/soap/tests/server012.phpt index 9740d02614bf0..703aefbaa7874 100644 --- a/ext/soap/tests/server012.phpt +++ b/ext/soap/tests/server012.phpt @@ -3,7 +3,7 @@ SOAP Server 12: WSDL generation --SKIPIF-- --EXTENSIONS--