Merge branch 'master' into ci

Author: NattyNarwhal

ibm_statement.c

@@ -1084,6 +1084,12 @@ static int stmt_bind_column(pdo_stmt_t *stmt, int colno)
 		case SQL_NUMERIC:
 		default:
 			in_length = col_res->data_size + in_length;
+#ifdef PASE
+			/* this includes null terminator, so a bit sloppy */
+			if (PDO_IBM_G(i5_dbcs_alloc)) {
+				in_length *= 6;
+			}
+#endif
 			col_res->data.str_val = (char *) emalloc(in_length+1);
 			check_stmt_allocation(col_res->data.str_val,
 					"stmt_bind_column",

pdo_ibm.c

@@ -87,6 +87,8 @@ ZEND_GET_MODULE(pdo_ibm)
 PHP_INI_BEGIN()
 	STD_PHP_INI_ENTRY("pdo_ibm.i5_override_ccsid", "0", PHP_INI_SYSTEM, OnUpdateLong,
 		i5_override_ccsid, zend_pdo_ibm_globals, pdo_ibm_globals)
+	STD_PHP_INI_ENTRY("pdo_ibm.i5_dbcs_alloc", "0", PHP_INI_SYSTEM, OnUpdateLong,
+		i5_dbcs_alloc, zend_pdo_ibm_globals, pdo_ibm_globals)
 PHP_INI_END()
 #endif /* PASE */
 

php_pdo_ibm.h

@@ -51,6 +51,7 @@ PHP_MINFO_FUNCTION(pdo_ibm);
 ZEND_BEGIN_MODULE_GLOBALS(pdo_ibm)
 	long		i5_ignore_userid; 		/* blank userid, possible no qsqsrvr  */
 	long		i5_override_ccsid; 		/* prior any CLI routine override ascii ccsid */
+	long		i5_dbcs_alloc;			/* if to overallocate buffers for unpredictable conversions */
 ZEND_END_MODULE_GLOBALS(pdo_ibm)
 #endif /* PASE */