- Fixed borked test bug52820.phpt.

- Synced htmlentities17.phpt with trunk; there's no ≀ entity
  in HTML 4.01.

diff --git a/ext/standard/tests/file/bug52820.phpt b/ext/standard/tests/file/bug52820.phpt
index 70ac9e02b99d75ae0a323383be78866a943b892a..b398cc4b83dd75a9ed16d5e233db677caf3d1854 100644 (file)
--- a/ext/standard/tests/file/bug52820.phpt
+++ b/ext/standard/tests/file/bug52820.phpt
@@ -47,52 +47,3 @@ About to rewind!
 * Closing connection #0\r
 \r
 Done.\r
---TEST--\r
-Bug #52820 (writes to fopencookie FILE* not commited when seeking the stream)\r
---SKIPIF--\r
-<?php\r
-/* unfortunately no standard function does a cast to FILE*, so we need\r
- * curl to test this */\r
-if (!extension_loaded("curl")) exit("skip curl extension not loaded");\r
-$handle=curl_init('http://127.0.0.1:37349/');\r
-curl_setopt($handle, CURLOPT_VERBOSE, true);\r
-curl_setopt($handle, CURLOPT_RETURNTRANSFER, true);\r
-if (!curl_setopt($handle, CURLOPT_STDERR, fopen("php://memory", "w+")))\r
-    die("skip fopencookie not supported on this platform");\r
---FILE--\r
-<?php\r
-function do_stuff($url) {\r
-    $handle=curl_init('http://127.0.0.1:37349/');\r
-    curl_setopt($handle, CURLOPT_VERBOSE, true);\r
-    curl_setopt($handle, CURLOPT_RETURNTRANSFER, true);\r
-    curl_setopt($handle, CURLOPT_STDERR, $o = fopen($url, "w+"));\r
-    curl_exec($handle);\r
-    echo "About to rewind!\n";\r
-    rewind($o);\r
-    echo stream_get_contents($o);\r
-    return $o;\r
-}\r
-\r
-echo "temp stream (close after):\n";\r
-fclose(do_stuff("php://temp"));\r
-\r
-echo "\nmemory stream (close after):\n";\r
-fclose(do_stuff("php://memory"));\r
-\r
-echo "\nDone.\n";\r
---EXPECT--\r
-temp stream (close after):\r
-About to rewind!\r
-* About to connect() to 127.0.0.1 port 37349 (#0)\r
-*   Trying 127.0.0.1... * Connection refused\r
-* couldn't connect to host\r
-* Closing connection #0\r
-\r
-memory stream (close after):\r
-About to rewind!\r
-* About to connect() to 127.0.0.1 port 37349 (#0)\r
-*   Trying 127.0.0.1... * Connection refused\r
-* couldn't connect to host\r
-* Closing connection #0\r
-\r
-Done.\r

diff --git a/ext/standard/tests/strings/htmlentities17.phpt b/ext/standard/tests/strings/htmlentities17.phpt
index b203e7c3e0272685b7bf278a73df849a3ce76ab0..d9e67a9b87802486f6a27de31209bd328f3c8269 100644 (file)
--- a/ext/standard/tests/strings/htmlentities17.phpt
+++ b/ext/standard/tests/strings/htmlentities17.phpt
@@ -3,7 +3,6 @@ htmlentities() / html_entity_decode() #8592 - #9002 table test
 --FILE--
 <?php
 $tests = array(
-       array(8768, '&wreath;', "e28980"),
        array(8853, '&oplus;',  "e28a95"),
        array(8855, '&otimes;', "e28a97"),
        array(8869, '&perp;',   "e28aa5"),
@@ -26,7 +25,6 @@ foreach ($tests as $test) {
 }
 ?>
 --EXPECT--
-string(8) "&wreath;"
 string(7) "&oplus;"
 string(8) "&otimes;"
 string(6) "&perp;"
@@ -37,7 +35,6 @@ string(8) "&lfloor;"
 string(8) "&rfloor;"
 string(6) "&lang;"
 string(6) "&rang;"
-string(6) "e28980"
 string(6) "e28a95"
 string(6) "e28a97"
 string(6) "e28aa5"