From: Ilia Alshanetsky <iliaal@php.net>
Date: Mon, 19 Mar 2012 17:10:53 +0000 (-0400)
Subject: Merge branch '53' into 54
X-Git-Tag: PHP-5.4.1-RC1~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5709f7dd5bd6874257f7b0f49f90fc1ff627a918;p=php

Merge branch '53' into 54

* 53:
  Fixed bug #61430 (Transposed memset() params in sapi/fpm/fpm/fpm_shm.c).
---

5709f7dd5bd6874257f7b0f49f90fc1ff627a918
diff --cc NEWS
index 1b9b4cf256,a2d7c051e6..ae0d190913
--- a/NEWS
+++ b/NEWS
@@@ -21,23 -13,26 +21,27 @@@ PH
    . Fixed bug #61072 (Memory leak when restoring an exception handler).
      (Nikic, Laruence)
    . Fixed bug #61058 (array_fill leaks if start index is PHP_INT_MAX).
 -	(Laruence)
 -  . Fixed bug #61000 (Exceeding max nesting level doesn't delete numerical
 -	vars). (Laruence)
 -  . Fix bug #60895 (Possible invalid handler usage in windows random
 -    functions). (Pierre)
 -  . Fixed bug #60825 (Segfault when running symfony 2 tests).
 -    (Dmitry, Laruence)
 +    (Laruence)
 +  . Fixed bug #61052 (Missing error check in trait 'insteadof' clause). (Stefan)
 +  . Fixed bug #61011 (Crash when an exception is thrown by __autoload
 +    accessing a static property). (Laruence)
 +  . Fixed bug #61000 (Exceeding max nesting level doesn't delete numerical 
 +    vars). (Laruence)
 +  . Fixed bug #60978 (exit code incorrect). (Laruence)
 +  . Fixed bug #60911 (Confusing error message when extending traits). (Stefan)
    . Fixed bug #60801 (strpbrk() mishandles NUL byte). (Adam)
 +  . Fixed bug #60717 (Order of traits in use statement can cause a fatal
 +    error). (Stefan)
 +  . Fixed bug #60573 (type hinting with "self" keyword causes weird errors).
 +    (Laruence)
    . Fixed bug #60569 (Nullbyte truncates Exception $message). (Ilia)
 -  . Fixed bug #60227 (header() cannot detect the multi-line header with CR).
 -    (rui, Gustavo)
 -  . Fixed bug #60222 (time_nanosleep() does validate input params). (Ilia)
    . Fixed bug #52719 (array_walk_recursive crashes if third param of the
      function is by reference). (Nikita Popov)
 -  . Fixed bug #51860 (Include fails with toplevel symlink to /). (Dmitry)
  
+ - FPM
+   . Fixed bug #61430 (Transposed memset() params in sapi/fpm/fpm/fpm_shm.c).
+     (michaelhood at gmail dot com, Ilia)
+ 
  - Ibase
    . Fixed bug #60947 (Segmentation fault while executing ibase_db_info).
      (Ilia)