Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed Bug #62005 (unexpected behavior when incrementally assigning to a member of a null object)
  fix stack overflow in php_intlog10abs()

Conflicts:
	Zend/zend_execute.c

diff --cc NEWS
index 371753792f9a4505afa6eafaaab64f947bffb3bb,1057db7d846737502e0c0d921b59ed485613cbf9..a87211298fee2a1991dccfb6557c6e1e8ec7521d
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -16,27 -11,19 +16,29 @@@ PH
      (Laruence)
  
  - Core:
+   . Fixed bug #62005 (unexpected behavior when incrementally assigning to a 
+     member of a null object). (Laruence)
 +  . Fixed bug #61978 (Object recursion not detected for classes that implement
 +    JsonSerializable). (Felipe)
    . Fixed bug #61730 (Segfault from array_walk modifying an array passed by
      reference). (Laruence)
 +  . Fixed bug #61922 (ZTS build doesn't accept zend.script_encoding config).
 +    (Laruence)
    . Fixed missing bound check in iptcparse(). (chris at chiappa.net)
 -  . Fixed bug #61764 ('I' unpacks n as signed if n > 2^31-1 on LP64). (Gustavo)
 +  . Fixed bug #61827 (incorrect \e processing on Windows) (Anatoliy)
 +  . Fixed bug #61761 ('Overriding' a private static method with a different 
 +    signature causes crash). (Laruence)
 +  . Fixed bug #61728 (PHP crash when calling ob_start in request_shutdown 
 +    phase). (Laruence)
 +  . Fixed bug #61660 (bin2hex(hex2bin($data)) != $data). (Nikita Popov)
 +  . Fixed bug #61650 (ini parser crashes when using ${xxxx} ini variables
 +    (without apache2)). (Laruence)
 +  . Fixed bug #61605 (header_remove() does not remove all headers). (Laruence)
    . Fixed bug #54197 ([PATH=] sections incompatibility with user_ini.filename
      set to null). (Anatoliy)
 -  . Fixed bug #61713 (Logic error in charset detection for htmlentities).
 -    (Anatoliy)
    . Fixed bug #61991 (long overflow in realpath_cache_get()). (Anatoliy)
  
 -- Fileinfo:
 +- FPM
    . Fixed bug #61812 (Uninitialised value used in libmagic). 
      (Laruence, Gustavo)
  

diff --cc Zend/tests/bug62005.phpt
index 0000000000000000000000000000000000000000,4ff4b2ca9a75afe59892bf2850320408845233f5..c99b28726fee9e34dee5e0bd22532875e0270276
mode 000000,100644..100644
--- /dev/null
--- 2/Zend/tests/bug62005.phpt
+++ b/Zend/tests/bug62005.phpt
@@@ -1,0 -1,15 +1,15 @@@
 -Strict Standards: Creating default object from empty value in %sbug62005.php on line %d
+ --TEST--
+ Bug #62005 (unexpected behavior when incrementally assigning to a member of a null object)
+ --FILE--
+ <?php
+ function add_points($player, $points) {
+     $player->energy += $points;
+     print_r($player);
+ }
+ add_points(NULL, 2);
+ --EXPECTF--
++Warning: Creating default object from empty value in %sbug62005.php on line %d
+ stdClass Object
+ (
+     [energy] => 2
+ )

diff --cc Zend/zend_execute.c
index d72fc7369aff7407c1f4029d762134db0bcf0def,4423921649f6fc6e2e418fce092f0346094732f1..205531fd28e53c779bb3531288f13f64ea1035e2
--- 1/Zend/zend_execute.c
--- 2/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@@ -557,8 -435,7 +557,7 @@@ static inline void make_real_object(zva
                SEPARATE_ZVAL_IF_NOT_REF(object_ptr);
                zval_dtor(*object_ptr);
                object_init(*object_ptr);
 -              zend_error(E_STRICT, "Creating default object from empty value");
++              zend_error(E_WARNING, "Creating default object from empty value");
        }
  }