archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 13:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.1'

Browse source
This commit is contained in:
Christopher Jones 2017-07-14 14:14:10 +10:00
commit b280ba854a
3 changed files with 22 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

21
ext/oci8/package.xml
View file

@ -50,8 +50,8 @@ Interoperability Support" (ID 207303.1) for details.
<time>12:00:00</time> <time>12:00:00</time>
<version> <version>
<release>2.1.5</release> <release>2.1.6</release>
<api>2.1.5</api> <api>2.1.6</api>
</version> </version>
<stability> <stability>
<release>stable</release> <release>stable</release>
@ -60,7 +60,6 @@ Interoperability Support" (ID 207303.1) for details.
<license uri="http://www.php.net/license">PHP</license> <license uri="http://www.php.net/license">PHP</license>
<notes> <notes>
This version is for PHP 7 only. This version is for PHP 7 only.
Added TAF callback support (PR #2459, KoenigsKind)
Fixed bug #74625 (Integer overflow in oci_bind_array_by_name). (Ingmar Runge) Fixed bug #74625 (Integer overflow in oci_bind_array_by_name). (Ingmar Runge)
</notes> </notes>
<contents> <contents>
@ -471,6 +470,22 @@ Fixed bug #74625 (Integer overflow in oci_bind_array_by_name). (Ingmar Runge)
</extsrcrelease> </extsrcrelease>
<changelog> <changelog>
<release>
<version>
<release>2.1.5</release>
<api>2.1.5</api>
</version>
<stability>
<release>stable</release>
<api>stable</api>
</stability>
<license uri="http://www.php.net/license">PHP</license>
<notes>
This version is for PHP 7 only.
Added TAF callback support (PR #2459, KoenigsKind)
</notes>
</release>
<release> <release>
<version> <version>
<release>2.1.4</release> <release>2.1.4</release>

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.1.5" #define PHP_OCI8_VERSION "2.1.6"
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.1.5 The value of DRIVER_NAME is PHP OCI8 : 2.1.6
***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.1.5 The value of DRIVER_NAME is PHP OCI8 : 2.1.6
Testing with oci_new_connect() Testing with oci_new_connect()
The value of DRIVER_NAME is PHP OCI8 : 2.1.5 The value of DRIVER_NAME is PHP OCI8 : 2.1.6
Done Done