[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/standard/string.c

[Nikita Popov]

Commit:    5cf2f87fa78a01497f3e77fc0476a89904f1ead9
Author:    Nikita Popov <ni...@php.net>         Thu, 5 Jul 2012 20:59:18 +0200
Parents:   9a38ca8d5097c9cbebe21a56e64d3b331764b0be 
157ddd95773114c1148536b4b32fcbedf0c79b20
Branches:  PHP-5.4 master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=5cf2f87fa78a01497f3e77fc0476a89904f1ead9

Log:
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fix potential integer overflow in nl2br
  Fix potential integer overflow in bin2hex

Conflicts:
        ext/standard/string.c

Changed paths:
  MM  ext/standard/string.c


Diff:



--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php