- Fixed borked test bug52820.phpt.

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

2 files changed, 0 insertions, 52 deletions

diff --git a/ext/standard/tests/file/bug52820.phpt b/ext/standard/tests/file/bug52820.phpt
index 70ac9e02b9..b398cc4b83 100644
--- a/ext/standard/tests/file/bug52820.phpt
+++ b/ext/standard/tests/file/bug52820.phpt
@@ -47,52 +47,3 @@ About to rewind!
 * 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.

diff --git a/ext/standard/tests/strings/htmlentities17.phpt b/ext/standard/tests/strings/htmlentities17.phpt
index b203e7c3e0..d9e67a9b87 100644
--- 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"