archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.2' into PHP-7.3

Browse source
This commit is contained in:
Christopher Jones 2018-12-08 19:24:59 +11:00
commit e355e55e01
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/oci8/oci8.c
View file

@ -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;
}

2
ext/oci8/php_oci8.h
View file

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