diff options
| author | Christopher Jones <christopher.jones@oracle.com> | 2018-12-08 19:24:59 +1100 |
|---|---|---|
| committer | Christopher Jones <christopher.jones@oracle.com> | 2018-12-08 19:24:59 +1100 |
| commit | e355e55e01134faf258e39c5c39a9a8392649367 (patch) | |
| tree | d2acd4471cfb5d28453527989be20a24abe5e519 /ext/oci8 | |
| parent | 78c299ae2d770f9f02de3cc520799437297c1fd6 (diff) | |
| parent | dd0a8091f469e66321c2ddd9176ccac09a88b203 (diff) | |
| download | php-git-e355e55e01134faf258e39c5c39a9a8392649367.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
Diffstat (limited to 'ext/oci8')
| -rw-r--r-- | ext/oci8/oci8.c | 2 | ||||
| -rw-r--r-- | ext/oci8/php_oci8.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c index 3e631c0adc..bd46cd2aed 100644 --- 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 index 0df48207a5..b1e801ad4c 100644 --- 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 |