Merge branch 'PHP-5.4' into PHP-5.5

diff --cc ext/pgsql/pgsql.c
index b37f40a8eb8ab510a94c280c5468b9a08343f773,c4632aecbf621dba386a9b9a49aa2f89a79273ed..a39b4e6ecb61f9ffc60194b062730b070d40d818
--- 1/ext/pgsql/pgsql.c
--- 2/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@@ -5441,8 -5441,8 +5442,8 @@@ PHP_PGSQL_API int php_pgsql_convert(PGc
                 zend_hash_move_forward_ex(Z_ARRVAL_P(values), &pos)) {
                skip_field = 0;
                new_val = NULL;
-               
+ 
 -              if ((key_type = zend_hash_get_current_key_ex(Z_ARRVAL_P(values), &field, &field_len, &num_idx, 0, &pos)) == HASH_KEY_NON_EXISTANT) {
 +              if ((key_type = zend_hash_get_current_key_ex(Z_ARRVAL_P(values), &field, &field_len, &num_idx, 0, &pos)) == HASH_KEY_NON_EXISTENT) {
                        php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to get array key type");
                        err = 1;
                }