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-10 21:54:23 +11:00
commit 6f6a15e1ae
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ext/oci8/package.xml
View file

@ -52,12 +52,12 @@ Interoperability Support" (ID 207303.1) for details.
<active>no</active> <active>no</active>
</lead> </lead>
<date>2017-08-15</date> <date>2018-12-11</date>
<time>12:00:00</time> <time>12:00:00</time>
<version> <version>
<release>2.10.0</release> <release>2.2.0</release>
<api>2.10.0</api> <api>2.2.0</api>
</version> </version>
<stability> <stability>
<release>stable</release> <release>stable</release>
@ -69,7 +69,7 @@ This version is for PHP 7 only.
Added oci_set_call_timeout() for call timeouts. (Requires Oracle client libraries 18c or later) Added oci_set_call_timeout() for call timeouts. (Requires Oracle client libraries 18c or later)
Added oci_set_db_operation() for the Oracle Database 'DBOP' end-to-end-tracing attribute. (Requires Oracle 12.2 or later) Added oci_set_db_operation() for the Oracle Database 'DBOP' end-to-end-tracing attribute. (Requires Oracle 12.2 or later)
Fixed bug #76804 (oci_pconnect with OCI_CRED_EXT not working). (KoenigsKind) Fixed bug #76804 (oci_pconnect with OCI_CRED_EXT not working). (KoenigsKind)
Fixed installation on 7.3. Fixed installation on PHP 7.3.
Internal change: Convert some parameter parsing to the Fast Parameter Parsing API. Internal change: Convert some parameter parsing to the Fast Parameter Parsing API.
</notes> </notes>
<contents> <contents>

2
ext/oci8/php_oci8.h
View file

@ -43,7 +43,7 @@
*/ */
#undef PHP_OCI8_VERSION #undef PHP_OCI8_VERSION
#endif #endif
#define PHP_OCI8_VERSION "2.10.0" #define PHP_OCI8_VERSION "2.2.0"
extern zend_module_entry oci8_module_entry; extern zend_module_entry oci8_module_entry;
#define phpext_oci8_ptr &oci8_module_entry #define phpext_oci8_ptr &oci8_module_entry

6
ext/oci8/tests/driver_name.phpt
View file

@ -57,11 +57,11 @@ function get_attr($conn)
?> ?>
--EXPECT-- --EXPECT--
**Test 1.1 - Default values for the attribute ************** **Test 1.1 - Default values for the attribute **************
The value of DRIVER_NAME is PHP OCI8 : 2.10.0 The value of DRIVER_NAME is PHP OCI8 : 2.2.0
***Test 1.2 - Get the values from different connections ************** ***Test 1.2 - Get the values from different connections **************
Testing with oci_pconnect() Testing with oci_pconnect()
The value of DRIVER_NAME is PHP OCI8 : 2.10.0 The value of DRIVER_NAME is PHP OCI8 : 2.2.0
Testing with oci_new_connect() Testing with oci_new_connect()
The value of DRIVER_NAME is PHP OCI8 : 2.10.0 The value of DRIVER_NAME is PHP OCI8 : 2.2.0
Done Done