From: Stanislav Malyshev <stas@php.net>
Date: Sun, 16 Jun 2013 23:55:18 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a770ae36c2ce25fd576557d63ceb244d80f9289d;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix bug #64764: Add status option to fpm init.d script
---

a770ae36c2ce25fd576557d63ceb244d80f9289d
diff --cc NEWS
index 5ac86613c7,98b2ee0faa..d10d3f69d2
--- a/NEWS
+++ b/NEWS
@@@ -8,9 -8,18 +8,12 @@@ PH
    . Fixed bug #64936 (doc comments picked up from previous scanner run). (Stas,
      Jonathan Oddy)
    . Fixed bug #64934 (Apache2 TS crash with get_browser()). (Anatol)
 -  . Fixed bug #64166 (quoted-printable-encode stream filter incorrectly 
 +  . Fixed bug #64166 (quoted-printable-encode stream filter incorrectly
      discarding whitespace). (Michael M Slusarz)
  
 -- DateTime:
 -  . Fixed bug #53437 (Crash when using unserialized DatePeriod instance).
 -    (Gustavo, Derick, Anatol)
 -
+ - FPM:
 -  . Fixed Bug #64915 (error_log ignored when daemonize=0). (Remi)
+   . Implemented FR #64764 (add support for FPM init.d script). (Lior Kaplan)
+ 
  - PDO:
    . Fixed bug #63176 (Segmentation fault when instantiate 2 persistent PDO to 
      the same db server). (Laruence)