]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
* '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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.