From: Julien Pauli <jpauli@php.net>
Date: Tue, 2 Feb 2016 17:17:16 +0000 (+0100)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.1.0alpha2~54^2~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0d1d814e1acbf8a3c75d5b9f770db322989e5b20;p=php

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
---

0d1d814e1acbf8a3c75d5b9f770db322989e5b20
diff --cc ext/standard/string.c
index 03f04a8287,bcfc3b6181..2dbe41ed5e
--- a/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;