Sync tests between branches and fix the getcontent test

diff --git a/ext/curl/tests/curl_multi_getcontent_basic3.phpt b/ext/curl/tests/curl_multi_getcontent_basic3.phpt
index bf17ab6b606c03f391f9a49f23946c8061a6d4f4..0e448cd2e9d7faad2829af14583ed91f37966f87 100644 (file)
--- a/ext/curl/tests/curl_multi_getcontent_basic3.phpt
+++ b/ext/curl/tests/curl_multi_getcontent_basic3.phpt
@@ -5,7 +5,7 @@ Rein Velt (rein@velt.org)
 #TestFest Utrecht 20090509
 --SKIPIF--
 <?php
-if (!extension_loaded('curl')) print 'skip';
+if (!extension_loaded('curl')) print 'skip need ext/curl';
 ?>
 --FILE--
 <?php
@@ -51,6 +51,7 @@ User-agent: *
 Disallow: /backend/
 Disallow: /distributions/
 Disallow: /stats/
+Disallow: /server-status/
 Disallow: /source.php
 Disallow: /search.php
 Disallow: /mod.php