]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorMatteo Beccati <mbeccati@php.net>
Fri, 12 Jun 2015 00:08:30 +0000 (02:08 +0200)
committerMatteo Beccati <mbeccati@php.net>
Fri, 12 Jun 2015 00:08:30 +0000 (02:08 +0200)
* PHP-5.6:
  Fix bug #69344 (PDO PgSQL Incorrect binding numeric array with gaps)
  Fix bug #69362 (PDO-pgsql fails to connect if password contains a leading single quote)
  Fixed bug #61574 - No MSI

Conflicts:
ext/pdo_pgsql/pgsql_statement.c

1  2 
ext/pdo_pgsql/pgsql_statement.c

index 835c4dd97db4f7c8e4c15dbdaf5c626a00f87f2a,708977c55e2a57a12db5d58daee46ecb8158b926..9c2a0e2efda010cc39fc45ea62ff769dd5096d1b
@@@ -299,10 -297,8 +299,10 @@@ static int pgsql_stmt_param_hook(pdo_st
                                                        sizeof(Oid));
                                }
                                if (param->paramno >= 0) {
-                                       if (param->paramno >= zend_hash_num_elements(stmt->bound_param_map)) {
-                                               pdo_pgsql_error_stmt(stmt, PGRES_FATAL_ERROR, "HY105");
 +                                      zval *parameter;
 +
 -                                              pdo_raise_impl_error(stmt->dbh, stmt, "HY093", "parameter was not defined" TSRMLS_CC);
+                                       if (param->paramno >= zend_hash_num_elements(stmt->bound_params)) {
++                                              pdo_raise_impl_error(stmt->dbh, stmt, "HY093", "parameter was not defined");
                                                return 0;
                                        }