diff options
| author | Stanislav Malyshev <stas@php.net> | 2016-06-27 12:32:11 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2016-06-27 12:32:11 -0700 |
| commit | b8487b6a7dcf102dd2015105b54279dad701b97b (patch) | |
| tree | f38501ca52e215d94f0453d84c81064cdf406d3a | |
| parent | 1314db71091a171e9c2a6b27a4a74c628e76ada9 (diff) | |
| parent | 25bd11cf271f801efa346195d540f3d8e3bcb0ef (diff) | |
| download | php-git-b8487b6a7dcf102dd2015105b54279dad701b97b.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix the fix for #72403 on nl2br
5.5.38 now
Conflicts:
configure.in
main/php_version.h
| -rw-r--r-- | ext/standard/string.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/string.c b/ext/standard/string.c index f1e706152c..39413c8211 100644 --- 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; |