svn: /php/php-src/ branches/PHP_5_3/ext/curl/tests/curl_multi_getcontent_basic3.phpt branches/PHP_5_4/ext/curl/tests/curl_copy_handle_basic_002.phpt
trunk/ext/curl/tests/curl_basic_011.phpt trunk/ext/curl/tests/curl_basic_012.phpt trunk/ext/curl/tests/curl_basic_013.phpt
trunk/ext/curl/tests/curl_multi_getcontent_basic3.phpt

bjori Wed, 07 Sep 2011 10:38:53 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=316325 Log: Sync tests between branches and fix the getcontent test Changed paths: U php/php-src/branches/PHP_5_3/ext/curl/tests/curl_multi_getcontent_basic3.phpt U php/php-src/branches/PHP_5_4/ext/curl/tests/curl_copy_handle_basic_002.phpt U php/php-src/trunk/ext/curl/tests/curl_basic_011.phpt U php/php-src/trunk/ext/curl/tests/curl_basic_012.phpt U php/php-src/trunk/ext/curl/tests/curl_basic_013.phpt U php/php-src/trunk/ext/curl/tests/curl_multi_getcontent_basic3.phpt Modified: php/php-src/branches/PHP_5_3/ext/curl/tests/curl_multi_getcontent_basic3.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/curl/tests/curl_multi_getcontent_basic3.phpt 2011-09-07 10:38:23 UTC (rev 316324) +++ php/php-src/branches/PHP_5_3/ext/curl/tests/curl_multi_getcontent_basic3.phpt 2011-09-07 10:38:53 UTC (rev 316325) @@ -5,7 +5,7 @@ #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 @@ Disallow: /backend/ Disallow: /distributions/ Disallow: /stats/ +Disallow: /server-status/ Disallow: /source.php Disallow: /search.php Disallow: /mod.php Modified: php/php-src/branches/PHP_5_4/ext/curl/tests/curl_copy_handle_basic_002.phpt =================================================================== --- php/php-src/branches/PHP_5_4/ext/curl/tests/curl_copy_handle_basic_002.phpt 2011-09-07 10:38:23 UTC (rev 316324) +++ php/php-src/branches/PHP_5_4/ext/curl/tests/curl_copy_handle_basic_002.phpt 2011-09-07 10:38:53 UTC (rev 316325) @@ -4,7 +4,7 @@ Rick Buitenman <rick@meritos.nl> #testfest Utrecht 2009 --SKIPIF-- -<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip"; ?> +<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip need PHP_CURL_HTTP_REMOTE_SERVER environment variable"; ?> --FILE-- <?php $host = getenv('PHP_CURL_HTTP_REMOTE_SERVER'); Modified: php/php-src/trunk/ext/curl/tests/curl_basic_011.phpt =================================================================== --- php/php-src/trunk/ext/curl/tests/curl_basic_011.phpt 2011-09-07 10:38:23 UTC (rev 316324) +++ php/php-src/trunk/ext/curl/tests/curl_basic_011.phpt 2011-09-07 10:38:53 UTC (rev 316325) @@ -35,4 +35,4 @@ *** Testing curl with cookie *** string(3) "bar" ===DONE=== - + Modified: php/php-src/trunk/ext/curl/tests/curl_basic_012.phpt =================================================================== --- php/php-src/trunk/ext/curl/tests/curl_basic_012.phpt 2011-09-07 10:38:23 UTC (rev 316324) +++ php/php-src/trunk/ext/curl/tests/curl_basic_012.phpt 2011-09-07 10:38:53 UTC (rev 316325) @@ -3,7 +3,7 @@ --CREDITS-- TestFest 2009 - AFUP - Xavier Gorse <xgorse@elao.com> --SKIPIF-- -<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip"; ?> +<?php if (!extension_loaded("curl") || false === getenv(b'PHP_CURL_HTTP_REMOTE_SERVER')) print "skip"; ?> --FILE-- <?php /* Prototype : bool curl_setopt(resource ch, int option, mixed value) @@ -35,3 +35,4 @@ *** Testing curl with HTTP/1.0 *** string(8) "HTTP/1.0" ===DONE=== + \ No newline at end of file Modified: php/php-src/trunk/ext/curl/tests/curl_basic_013.phpt =================================================================== --- php/php-src/trunk/ext/curl/tests/curl_basic_013.phpt 2011-09-07 10:38:23 UTC (rev 316324) +++ php/php-src/trunk/ext/curl/tests/curl_basic_013.phpt 2011-09-07 10:38:53 UTC (rev 316325) @@ -3,7 +3,7 @@ --CREDITS-- TestFest 2009 - AFUP - Xavier Gorse <xgorse@elao.com> --SKIPIF-- -<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip"; ?> +<?php if (!extension_loaded("curl") || false === getenv(b'PHP_CURL_HTTP_REMOTE_SERVER')) print "skip"; ?> --FILE-- <?php /* Prototype : bool curl_setopt(resource ch, int option, mixed value) @@ -35,3 +35,4 @@ *** Testing curl with HTTP/1.1 *** string(8) "HTTP/1.1" ===DONE=== + \ No newline at end of file Modified: php/php-src/trunk/ext/curl/tests/curl_multi_getcontent_basic3.phpt =================================================================== --- php/php-src/trunk/ext/curl/tests/curl_multi_getcontent_basic3.phpt 2011-09-07 10:38:23 UTC (rev 316324) +++ php/php-src/trunk/ext/curl/tests/curl_multi_getcontent_basic3.phpt 2011-09-07 10:38:53 UTC (rev 316325) @@ -5,7 +5,7 @@ #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 @@ Disallow: /backend/ Disallow: /distributions/ Disallow: /stats/ +Disallow: /server-status/ Disallow: /source.php Disallow: /search.php Disallow: /mod.php