From: Matteo Beccati <mbeccati@php.net>
Date: Fri, 12 Jun 2015 00:08:30 +0000 (+0200)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: php-7.0.0alpha2~2^2~162
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=730d7b8fcad30addc80d685e046b5f05bb3d0190;p=php

Merge branch 'PHP-5.6'

* 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
---

730d7b8fcad30addc80d685e046b5f05bb3d0190
diff --cc ext/pdo_pgsql/pgsql_statement.c
index 835c4dd97d,708977c55e..9c2a0e2efd
--- a/ext/pdo_pgsql/pgsql_statement.c
+++ b/ext/pdo_pgsql/pgsql_statement.c
@@@ -299,10 -297,8 +299,10 @@@ static int pgsql_stmt_param_hook(pdo_st
  							sizeof(Oid));
  				}
  				if (param->paramno >= 0) {
 +					zval *parameter;
 +
- 					if (param->paramno >= zend_hash_num_elements(stmt->bound_param_map)) {
- 						pdo_pgsql_error_stmt(stmt, PGRES_FATAL_ERROR, "HY105");
+ 					if (param->paramno >= zend_hash_num_elements(stmt->bound_params)) {
 -						pdo_raise_impl_error(stmt->dbh, stmt, "HY093", "parameter was not defined" TSRMLS_CC);
++						pdo_raise_impl_error(stmt->dbh, stmt, "HY093", "parameter was not defined");
  						return 0;
  					}