diff options
| author | Nikita Popov <nikic@php.net> | 2012-07-05 20:59:18 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2012-07-05 20:59:18 +0200 |
| commit | 5cf2f87fa78a01497f3e77fc0476a89904f1ead9 (patch) | |
| tree | 0d9eb34f61651031b8c157b56580fa366394cb4c /sapi/cli/php_cli.c | |
| parent | 9a38ca8d5097c9cbebe21a56e64d3b331764b0be (diff) | |
| parent | 157ddd95773114c1148536b4b32fcbedf0c79b20 (diff) | |
| download | php-git-5cf2f87fa78a01497f3e77fc0476a89904f1ead9.tar.gz | |
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
Diffstat (limited to 'sapi/cli/php_cli.c')
0 files changed, 0 insertions, 0 deletions