diff options
| author | Christopher Jones <sixd@php.net> | 2012-10-18 17:57:19 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2012-10-18 17:57:19 -0700 |
| commit | 85b0eda4c832fc6ffde0595764b2cee1d741cf41 (patch) | |
| tree | 1793e0b76e39f893f45379e234244d97d6d53629 /ext | |
| parent | 8bfc00287165b45e8f9759b6914261340161fa34 (diff) | |
| parent | af14da5714cbcd9c12f140bbb622f10aa0b227a8 (diff) | |
| download | php-git-85b0eda4c832fc6ffde0595764b2cee1d741cf41.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fixed bug #63307 (Unused variable in oci8.c)
Fixed bug #63265 (Add ORA-00028 to the PHP_OCI_HANDLE_ERROR macro)
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/oci8/oci8.c | 2 | ||||
| -rw-r--r-- | ext/oci8/package.xml | 4 | ||||
| -rw-r--r-- | ext/oci8/php_oci8.h | 2 | ||||
| -rw-r--r-- | ext/oci8/php_oci8_int.h | 1 |
4 files changed, 6 insertions, 3 deletions
diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c index bf2eaf558b..e2241cffb7 100644 --- a/ext/oci8/oci8.c +++ b/ext/oci8/oci8.c @@ -3197,7 +3197,7 @@ static int php_oci_create_session(php_oci_connection *connection, php_oci_spool PHP_OCI_CALL_RETURN(OCI_G(errcode), OCIAttrGet, ((dvoid *)actual_spool->poolh, OCI_HTYPE_SPOOL, (dvoid *)&numopen, (ub4 *)0, OCI_ATTR_SPOOL_OPEN_COUNT, OCI_G(err))); PHP_OCI_CALL_RETURN(OCI_G(errcode), OCIAttrGet, ((dvoid *)actual_spool->poolh, OCI_HTYPE_SPOOL, (dvoid *)&numbusy, (ub4 *)0, OCI_ATTR_SPOOL_BUSY_COUNT, OCI_G(err))); numfree = numopen - numbusy; /* number of free connections in the pool */ - php_printf ("OCI8 DEBUG L1: (numopen=%d)(numbusy=%d) at (%s:%d) \n", numopen, numbusy, __FILE__, __LINE__); + php_printf ("OCI8 DEBUG L1: (numopen=%d)(numbusy=%d)(numfree=%d) at (%s:%d) \n", numopen, numbusy, numfree, __FILE__, __LINE__); } /* }}} */ /* Ping loop: Ping and loop till we get a good connection. When a database instance goes diff --git a/ext/oci8/package.xml b/ext/oci8/package.xml index eac3f06552..63ece6f536 100644 --- a/ext/oci8/package.xml +++ b/ext/oci8/package.xml @@ -33,7 +33,7 @@ http://pear.php.net/dtd/package-2.0.xsd"> <active>no</active> </lead> - <date>2011-11-18</date> + <date>2012-10-21</date> <time>12:00:00</time> <version> @@ -46,6 +46,8 @@ http://pear.php.net/dtd/package-2.0.xsd"> </stability> <license uri="http://www.php.net/license">PHP</license> <notes> + Fixed bug #63307 (Unused variable in oci8.c) + Fixed bug #63265 (Add ORA-00028 to the PHP_OCI_HANDLE_ERROR macro) Fixed bug #60901 (Improve "tail" syntax for AIX installation) </notes> <contents> diff --git a/ext/oci8/php_oci8.h b/ext/oci8/php_oci8.h index 6363aea13f..efe8665f42 100644 --- a/ext/oci8/php_oci8.h +++ b/ext/oci8/php_oci8.h @@ -46,7 +46,7 @@ */ #undef PHP_OCI8_VERSION #endif -#define PHP_OCI8_VERSION "1.4.7" +#define PHP_OCI8_VERSION "1.4.8" extern zend_module_entry oci8_module_entry; #define phpext_oci8_ptr &oci8_module_entry diff --git a/ext/oci8/php_oci8_int.h b/ext/oci8/php_oci8_int.h index 724e8bae56..b0d65164c5 100644 --- a/ext/oci8/php_oci8_int.h +++ b/ext/oci8/php_oci8_int.h @@ -289,6 +289,7 @@ typedef struct { /* php_oci_out_column {{{ */ zend_bailout(); \ break; \ case 22: \ + case 28: \ case 378: \ case 602: \ case 603: \ |