Merge branch 'PHP-5.4' into PHP-5.5

diff --cc ext/standard/proc_open.c
index 1e37e645638cbad6bd4b0a2fbcc3cd9c6dd8eeac,7ffba0e24d61871095a190d84c32e6de24d4b364..f4c3b4738c6be729d01a6146a2ceceb6364d8b82
--- 1/ext/standard/proc_open.c
--- 2/ext/standard/proc_open.c
+++ b/ext/standard/proc_open.c
@@@ -172,9 -188,14 +188,14 @@@ static php_process_env_t _php_array_to_
  #endif
                                p += el_len + 1;
                                break;
 -                      case HASH_KEY_NON_EXISTANT:
 +                      case HASH_KEY_NON_EXISTENT:
                                break;
                }
+ 
+ next_element:
+               if (Z_TYPE_PP(element) != IS_STRING) {
+                       zval_dtor(&tmp);
+               }
        }
  
        assert((uint)(p - env.envp) <= sizeenv);