]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bdf2379 328a3d9)
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
authorChristopher Jones <sixd@php.net>
Tue, 11 Sep 2012 23:39:39 +0000 (16:39 -0700)
committerChristopher Jones <sixd@php.net>
Tue, 11 Sep 2012 23:39:39 +0000 (16:39 -0700)
commitc36d92733151bfab4b741ddb09d572759732d857
tree1632c05a79f85d006a0f4a00c4ca4fe7ed68e625tree | snapshot
parentbdf237940053fa4f448c18910f82e17f10841753commit | diff
parent328a3d9f1384d3555833345dbe879e4d99922a35commit | diff
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

* 'PHP-5.4' of https://git.php.net/repository/php-src:
  regenerate patch, and save a strlen
  Fix the wrong use of snprintf which is introduced in 1d2f61904987133d542c68cd349cf313d0bef1c8
  Fixed unintendent clearance of PHP_OUTPUT_ACTIVATED flag
Unnamed repository; edit this file 'description' to name the repository.