merge test to 5.3, and remove xfail since the bug was fixed

diff --git a/Zend/tests/bug61165.phpt b/Zend/tests/bug61165.phpt
new file mode 100644 (file)
index 0000000..478fa00
--- /dev/null
+++ b/Zend/tests/bug61165.phpt
@@ -0,0 +1,28 @@
+--TEST--
+Bug #61165 (Segfault - strip_tags())
+--FILE--
+<?php
+
+$handler = NULL;
+class T {
+    public $_this;
+
+    public function __toString() {
+               global $handler;
+           $handler = $this;
+        $this->_this = $this; // <-- uncoment this
+        return 'A';
+    }
+}
+
+$t = new T;
+for ($i = 0; $i < 3; $i++) {
+    strip_tags($t);
+       strip_tags(new T);
+}
+var_dump($handler);
+--EXPECTF--
+object(T)#%d (1) {
+  ["_this"]=>
+  *RECURSION*
+}