cataphract Thu, 18 Nov 2010 21:44:42 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=305528
Log: - Fixed borked test bug52820.phpt. - Synced htmlentities17.phpt with trunk; there's no ≀ entity in HTML 4.01. Bug: http://bugs.php.net/52820 (Closed) curl doesn't write to php://temp or /memory Changed paths: U php/php-src/branches/PHP_5_3/ext/standard/tests/file/bug52820.phpt U php/php-src/branches/PHP_5_3/ext/standard/tests/strings/htmlentities17.phpt Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/bug52820.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/standard/tests/file/bug52820.phpt 2010-11-18 21:41:47 UTC (rev 305527) +++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/bug52820.phpt 2010-11-18 21:44:42 UTC (rev 305528) @@ -47,52 +47,3 @@ * Closing connection #0 Done. ---TEST-- -Bug #52820 (writes to fopencookie FILE* not commited when seeking the stream) ---SKIPIF-- -<?php -/* unfortunately no standard function does a cast to FILE*, so we need - * curl to test this */ -if (!extension_loaded("curl")) exit("skip curl extension not loaded"); -$handle=curl_init('http://127.0.0.1:37349/'); -curl_setopt($handle, CURLOPT_VERBOSE, true); -curl_setopt($handle, CURLOPT_RETURNTRANSFER, true); -if (!curl_setopt($handle, CURLOPT_STDERR, fopen("php://memory", "w+"))) - die("skip fopencookie not supported on this platform"); ---FILE-- -<?php -function do_stuff($url) { - $handle=curl_init('http://127.0.0.1:37349/'); - curl_setopt($handle, CURLOPT_VERBOSE, true); - curl_setopt($handle, CURLOPT_RETURNTRANSFER, true); - curl_setopt($handle, CURLOPT_STDERR, $o = fopen($url, "w+")); - curl_exec($handle); - echo "About to rewind!\n"; - rewind($o); - echo stream_get_contents($o); - return $o; -} - -echo "temp stream (close after):\n"; -fclose(do_stuff("php://temp")); - -echo "\nmemory stream (close after):\n"; -fclose(do_stuff("php://memory")); - -echo "\nDone.\n"; ---EXPECT-- -temp stream (close after): -About to rewind! -* About to connect() to 127.0.0.1 port 37349 (#0) -* Trying 127.0.0.1... * Connection refused -* couldn't connect to host -* Closing connection #0 - -memory stream (close after): -About to rewind! -* About to connect() to 127.0.0.1 port 37349 (#0) -* Trying 127.0.0.1... * Connection refused -* couldn't connect to host -* Closing connection #0 - -Done. Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/strings/htmlentities17.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/standard/tests/strings/htmlentities17.phpt 2010-11-18 21:41:47 UTC (rev 305527) +++ php/php-src/branches/PHP_5_3/ext/standard/tests/strings/htmlentities17.phpt 2010-11-18 21:44:42 UTC (rev 305528) @@ -3,7 +3,6 @@ --FILE-- <?php $tests = array( - array(8768, '≀', "e28980"), array(8853, '⊕', "e28a95"), array(8855, '⊗', "e28a97"), array(8869, '⊥', "e28aa5"), @@ -26,7 +25,6 @@ } ?> --EXPECT-- -string(8) "≀" string(7) "⊕" string(8) "⊗" string(6) "⊥" @@ -37,7 +35,6 @@ string(8) "⌋" string(6) "⟨" string(6) "⟩" -string(6) "e28980" string(6) "e28a95" string(6) "e28a97" string(6) "e28aa5"
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php