From: Pierrick Charron <pierrick@php.net>
Date: Fri, 28 Sep 2012 19:28:37 +0000 (-0400)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.4.8RC1~21
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f495e9305716a6b2ce448e56cf463169b196d08c;p=php

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Update NEWS
---

f495e9305716a6b2ce448e56cf463169b196d08c
diff --cc NEWS
index ca00e47b45,a05085299b..e8ad1737a2
--- a/NEWS
+++ b/NEWS
@@@ -17,19 -8,17 +17,23 @@@ PH
      (Laruence)
    . Fixed bug #62976 (Notice: could not be converted to int when comparing
      some builtin classes). (Laruence)
 +  . Fixed bug #62955 (Only one directive is loaded from "Per Directory Values" 
 +    Windows registry). (aserbulov at parallels dot com)
 +  . Fixed bug #62907 (Double free when use traits). (Dmitry)
    . Fixed bug #61767 (Shutdown functions not called in certain error
      situation). (Dmitry)
 -  . Fixed bug #61442 (exception threw in __autoload can not be catched).
 -    (Laruence)
    . Fixed bug #60909 (custom error handler throwing Exception + fatal error
      = no shutdown function). (Dmitry)
 +  . Fixed bug #60723 (error_log error time has changed to UTC ignoring default
 +    timezo). (Laruence)
  
+ - cURL:
+   . Fixed bug #62085 (file_get_contents a remote file by Curl wrapper will
+     cause cpu Soaring). (Pierrick)
+ 
 +- DOM:
 +  . Fixed bug #63015 (Incorrect arginfo for DOMErrorHandler). (Rob)
 +
  - FPM:
    . Fixed bug #62954 (startup problems fpm / php-fpm). (fat)
    . Fixed bug #62886 (PHP-FPM may segfault/hang on startup). (fat)