]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4'
authorNikita Popov <nikic@php.net>
Thu, 5 Jul 2012 19:00:16 +0000 (21:00 +0200)
committerNikita Popov <nikic@php.net>
Thu, 5 Jul 2012 19:00:16 +0000 (21:00 +0200)
commited54357fcded8849c6830fa80b42bdde4650fdb8
treef7f302492a7cfa178578f28465bf1ff280533da2
parent3b104785c007def22c028cb4f6eb56a6a831a3b6
parent5cf2f87fa78a01497f3e77fc0476a89904f1ead9
Merge branch 'PHP-5.4'

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