Commit:    a770ae36c2ce25fd576557d63ceb244d80f9289d
Author:    Stanislav Malyshev <s...@php.net>         Sun, 16 Jun 2013 16:55:18 
-0700
Parents:   44822a7166ba17029e682c1fe0be270c2f076f0a 
ee01af7df149da2c511b0f91db2e161eebb2bf58
Branches:  PHP-5.5 master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=a770ae36c2ce25fd576557d63ceb244d80f9289d

Log:
Merge branch 'PHP-5.4' into PHP-5.5

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

Bugs:
https://bugs.php.net/64764

Changed paths:
  MM  NEWS


Diff:
diff --cc NEWS
index 5ac8661,98b2ee0..d10d3f6
--- 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)


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to