Revert "Fix #70720"

This reverts commit ff7ed9021cd72a7f82dd4301cdc266afdff458ad.

diff --git a/ext/standard/string.c b/ext/standard/string.c
index 3ac8dc1022d26cf25e6bd60051439ac5a1fcd2aa..23003dba7292559f38c198a8cb1b47ce56101996 100644 (file)
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -4798,9 +4798,6 @@ PHPAPI size_t php_strip_tags_ex(char *rbuf, size_t len, int *stateptr, const cha
                                switch (state) {
                                        case 1: /* HTML/XML */
                                                lc = '>';
-                                               if (*(p -1) == '-') {
-                                                       break;
-                                               }
                                                in_q = state = 0;
                                                if (allow) {
                                                        if (tp - tbuf >= PHP_TAG_BUF_SIZE) {
@@ -4930,7 +4927,7 @@ PHPAPI size_t php_strip_tags_ex(char *rbuf, size_t len, int *stateptr, const cha
                                 * state == 2 (PHP). Switch back to HTML.
                                 */
 
-                               if (state == 2 && p > buf+2 && strncasecmp(p-4, "<?xm", 4) == 0) {
+                               if (state == 2 && p > buf+2 && strncasecmp(p-2, "xm", 2) == 0) {
                                        state = 1;
                                        break;
                                }

diff --git a/ext/standard/tests/strings/bug70720.phpt b/ext/standard/tests/strings/bug70720.phpt
deleted file mode 100644 (file)
index edf6008..0000000
--- a/ext/standard/tests/strings/bug70720.phpt
+++ /dev/null
@@ -1,12 +0,0 @@
---TEST--
-Bug #70720 (strip_tags() doesnt handle "xml" correctly)
---FILE--
-<?php
-var_dump(strip_tags('<?php $dom->test(); ?> this is a test'));
-var_dump(strip_tags('<?php $xml->test(); ?> this is a test'));
-var_dump(strip_tags('<?xml $xml->test(); ?> this is a test'));
-?>
---EXPECTF--
-string(15) " this is a test"
-string(15) " this is a test"
-string(15) " this is a test"
\ No newline at end of file