Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Updated NEWS
  Fix #70720

Conflicts:
	ext/standard/string.c
	ext/standard/tests/strings/bug70720.phpt

diff --cc ext/standard/string.c
index 03f04a82873b1578e0189e80666200a112fc2d20,bcfc3b61812e014118bb3a5a4e2c2a65d89ac4cb..2dbe41ed5ed7d250d4758004cb0e126e02e4845b
--- 1/ext/standard/string.c
--- 2/ext/standard/string.c
+++ b/ext/standard/string.c
@@@ -4707,14 -4584,13 +4707,15 @@@ PHPAPI size_t php_strip_tags(char *rbuf
        swm: Added ability to strip <?xml tags without assuming it PHP
        code.
  */
 -PHPAPI size_t php_strip_tags_ex(char *rbuf, int len, int *stateptr, char *allow, int allow_len, zend_bool allow_tag_spaces)
 +PHPAPI size_t php_strip_tags_ex(char *rbuf, size_t len, int *stateptr, const char *allow, size_t allow_len, zend_bool allow_tag_spaces)
  {
        char *tbuf, *buf, *p, *tp, *rp, c, lc;
 -      int br, i=0, depth=0, in_q = 0;
 -      int state = 0, pos;
 +      int br, depth=0, in_q = 0;
 +      int state = 0;
 +      size_t pos, i = 0;
        char *allow_free = NULL;
 +      const char *allow_actual;
+       char is_xml = 0;
  
        if (stateptr)
                state = *stateptr;