From: Nikita Popov <nikita.ppv@gmail.com>
Date: Thu, 11 Jul 2019 08:26:19 +0000 (+0200)
Subject: Add server conflict to soap custom content type test
X-Git-Tag: php-7.4.0beta1~170
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ba8c4894d8b1316e986c01789b3dd0c25108c689;p=php

Add server conflict to soap custom content type test
---

diff --git a/ext/soap/tests/custom_content_type.phpt b/ext/soap/tests/custom_content_type.phpt
index b0dbc1d651..a0ee164053 100644
--- a/ext/soap/tests/custom_content_type.phpt
+++ b/ext/soap/tests/custom_content_type.phpt
@@ -8,6 +8,8 @@ SOAP customized Content-Type, eg. SwA use case
 		echo "skip sapi/cli/tests/php_cli_server.inc required but not found";
 	}
 ?>
+--CONFLICTS--
+server
 --FILE--
 <?php