From: Christopher Jones <sixd@php.net>
Date: Tue, 11 Sep 2012 23:39:39 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
X-Git-Tag: php-5.4.9RC1~35
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c36d92733151bfab4b741ddb09d572759732d857;p=php

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
---

c36d92733151bfab4b741ddb09d572759732d857