From: Yasuo Ohgaki <yohgaki@php.net>
Date: Sat, 15 Feb 2014 09:29:36 +0000 (+0900)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.10RC1~15
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6e0b8b4288ac3224c011b913ea93c7654fc04d12;p=php

Merge branch 'PHP-5.4' into PHP-5.5
---

6e0b8b4288ac3224c011b913ea93c7654fc04d12
diff --cc ext/pgsql/pgsql.c
index b37f40a8eb,c4632aecbf..a39b4e6ecb
--- a/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;
  		}