Merge branch 'PHP-5.5' into PHP-5.6

smalyshev · smalyshev · commit b8487b6a7dcf · 2016-06-27T12:32:11.000-07:00
* PHP-5.5:
  Fix the fix for #72403 on nl2br
  5.5.38 now

Conflicts:
	configure.in
	main/php_version.h
diff --git a/ext/standard/string.c b/ext/standard/string.c
@@ -4265,7 +4265,7 @@ PHP_FUNCTION(nl2br)
 {
 	/* in brief this inserts <br /> or <br> before matched regexp \n\r?|\r\n? */
 	char		*tmp, *str;
-	int		new_length;
+	size_t		new_length;
 	char		*end, *target;
 	int		repl_cnt = 0;
 	int		str_len;

Original file line number	Diff line number	Diff line change
`@@ -4265,7 +4265,7 @@ PHP_FUNCTION(nl2br)`
`4265`	`4265`	`{`
`4266`	`4266`	`/* in brief this inserts <br /> or <br> before matched regexp \n\r?\|\r\n? */`
`4267`	`4267`	`char tmp, str;`
`4268`		`- int new_length;`
	`4268`	`+ size_t new_length;`
`4269`	`4269`	`char end, target;`
`4270`	`4270`	`int repl_cnt = 0;`
`4271`	`4271`	`int str_len;`