Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix uninitialized memory usage

diff --cc ext/standard/array.c
index 9bfb0887ac231ebe6eecd5985c4137974fb3cf34,9b02575276544fc19f879572007437c2aa5141f4..e281690ecd6fd02915caba58da5cbf9f9a593bba
--- 1/ext/standard/array.c
--- 2/ext/standard/array.c
+++ b/ext/standard/array.c
@@@ -1041,8 -1053,11 +1041,8 @@@ PHP_FUNCTION(max
  static int php_array_walk(HashTable *target_hash, zval *userdata, int recursive TSRMLS_DC) /* {{{ */
  {
        zval **args[3],                 /* Arguments to userland function */
-                 *retval_ptr,          /* Return value - unused */
+                 *retval_ptr = NULL,           /* Return value - unused */
                  *key=NULL;            /* Entry key */
 -      char  *string_key;
 -      uint   string_key_len;
 -      ulong  num_key;
  
        /* Set up known arguments */
        args[1] = &key;