com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/pgsql/pgsql.c
| From: | Yasuo Ohgaki | Date: | Sat, 15 Feb 2014 09:29:36 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/pgsql/pgsql.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-75991@lists.php.net to get a copy of this message | ||
Commit: 6e0b8b4288ac3224c011b913ea93c7654fc04d12
Author: Yasuo Ohgaki <yohgaki@php.net> Sat, 15 Feb 2014 18:29:36 +0900
Parents: cf0741fd5baaf225e00758f624c779f04c21ea80 832c21cabfb6a54a0961f044d77987d166beb97c
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6e0b8b4288ac3224c011b913ea93c7654fc04d12
Log:
Merge branch 'PHP-5.4' into PHP-5.5
Changed paths:
MM ext/pgsql/pgsql.c
Diff:
diff --cc ext/pgsql/pgsql.c
index b37f40a,c4632ae..a39b4e6
--- 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;
}