Merge branch 'PHP-7.2' into PHP-7.3

cjbj · cjbj · commit e355e55e0113 · 2018-12-08T19:24:59.000+11:00
diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
@@ -2465,7 +2465,7 @@ int php_oci_column_to_zval(php_oci_out_column *column, zval *value, int mode)
 			descriptor = (php_oci_descriptor *) column->descid->ptr;
 
 			if (!descriptor) {
-				php_error_docref(NULL, E_WARNING, "Unable to find LOB descriptor #%d", column->descid);
+				php_error_docref(NULL, E_WARNING, "Unable to find LOB descriptor #%d", column->descid->handle);
 				return 1;
 			}
 
diff --git a/ext/oci8/php_oci8.h b/ext/oci8/php_oci8.h
@@ -43,7 +43,7 @@
  */
 #undef PHP_OCI8_VERSION
 #endif
-#define PHP_OCI8_VERSION "2.1.8"
+#define PHP_OCI8_VERSION "2.1.9"
 
 extern zend_module_entry oci8_module_entry;
 #define phpext_oci8_ptr &oci8_module_entry

Original file line number	Diff line number	Diff line change
`@@ -2465,7 +2465,7 @@ int php_oci_column_to_zval(php_oci_out_column column, zval value, int mode)`
`2465`	`2465`	`descriptor = (php_oci_descriptor *) column->descid->ptr;`
`2466`	`2466`
`2467`	`2467`	`if (!descriptor) {`
`2468`		`- php_error_docref(NULL, E_WARNING, "Unable to find LOB descriptor #%d", column->descid);`
	`2468`	`+ php_error_docref(NULL, E_WARNING, "Unable to find LOB descriptor #%d", column->descid->handle);`
`2469`	`2469`	`return 1;`
`2470`	`2470`	`}`
`2471`	`2471`