]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9a38ca8 157ddd9)
Merge branch 'PHP-5.3' into PHP-5.4
authorNikita Popov <nikic@php.net>
Thu, 5 Jul 2012 18:59:18 +0000 (20:59 +0200)
committerNikita Popov <nikic@php.net>
Thu, 5 Jul 2012 18:59:18 +0000 (20:59 +0200)
* PHP-5.3:
  Fix potential integer overflow in nl2br
  Fix potential integer overflow in bin2hex

Conflicts:
ext/standard/string.c

1  2 
ext/standard/string.c patch | diff1 | diff2 | blob | history

diff --cc ext/standard/string.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.