tony2001 Tue Mar 28 09:12:18 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src NEWS
/php-src/ext/oci8 oci8_interface.c
Log:
fix #36851 (Documentation and code discrepancies for NULL data)
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.485&r2=1.2027.2.486&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.485 php-src/NEWS:1.2027.2.486
--- php-src/NEWS:1.2027.2.485 Mon Mar 27 23:40:41 2006
+++ php-src/NEWS Tue Mar 28 09:12:17 2006
@@ -20,6 +20,8 @@
clone'ing). (Tony)
- Fixed bug #36857 (Added support for partial content fetching to the HTTP
streams wrapper). (Ilia)
+- Fixed bug #36851 (Documentation and code discrepancies for NULL data
+ in oci_fetch_*() functions). (Tony)
- Fixed bug #36825 (Exceptions thrown in ArrayObject::offsetGet cause
segfault). (Tony)
- Fixed bug #36820 (Privileged connection with an Oracle password file fails).
http://cvs.php.net/viewcvs.cgi/php-src/ext/oci8/oci8_interface.c?r1=1.8.2.6&r2=1.8.2.7&diff_format=u
Index: php-src/ext/oci8/oci8_interface.c
diff -u php-src/ext/oci8/oci8_interface.c:1.8.2.6
php-src/ext/oci8/oci8_interface.c:1.8.2.7
--- php-src/ext/oci8/oci8_interface.c:1.8.2.6 Tue Mar 21 15:47:31 2006
+++ php-src/ext/oci8/oci8_interface.c Tue Mar 28 09:12:18 2006
@@ -25,7 +25,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: oci8_interface.c,v 1.8.2.6 2006/03/21 15:47:31 tony2001 Exp $ */
+/* $Id: oci8_interface.c,v 1.8.2.7 2006/03/28 09:12:18 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1439,7 +1439,7 @@
Fetch a result row as an object */
PHP_FUNCTION(oci_fetch_object)
{
- php_oci_fetch_row(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_OCI_ASSOC, 2);
+ php_oci_fetch_row(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_OCI_ASSOC |
PHP_OCI_RETURN_NULLS, 2);
if (Z_TYPE_P(return_value) == IS_ARRAY) {
object_and_properties_init(return_value,
ZEND_STANDARD_CLASS_DEF_PTR, Z_ARRVAL_P(return_value));
@@ -1451,7 +1451,7 @@
Fetch a result row as an enumerated array */
PHP_FUNCTION(oci_fetch_row)
{
- php_oci_fetch_row(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_OCI_NUM, 1);
+ php_oci_fetch_row(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_OCI_NUM |
PHP_OCI_RETURN_NULLS, 1);
}
/* }}} */
@@ -1459,7 +1459,7 @@
Fetch a result row as an associative array */
PHP_FUNCTION(oci_fetch_assoc)
{
- php_oci_fetch_row(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_OCI_ASSOC, 1);
+ php_oci_fetch_row(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_OCI_ASSOC |
PHP_OCI_RETURN_NULLS, 1);
}
/* }}} */
@@ -1467,7 +1467,7 @@
Fetch a result row as an array */
PHP_FUNCTION(oci_fetch_array)
{
- php_oci_fetch_row(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_OCI_BOTH, 2);
+ php_oci_fetch_row(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_OCI_BOTH |
PHP_OCI_RETURN_NULLS, 2);
}
/* }}} */
@@ -1521,7 +1521,7 @@
}
/* }}} */
-/* {{{ proto resource oci_connect(string user, string pass [, string db])
+/* {{{ proto resource oci_connect(string user, string pass [, string db [,
string charset [, int session_mode ]])
Connect to an Oracle database and log on. Returns a new session. */
PHP_FUNCTION(oci_connect)
{
@@ -1529,7 +1529,7 @@
}
/* }}} */
-/* {{{ proto resource oci_pconnect(string user, string pass [, string db])
+/* {{{ proto resource oci_pconnect(string user, string pass [, string db [,
string charset ]])
Connect to an Oracle database using a persistent connection and log on.
Returns a new session. */
PHP_FUNCTION(oci_pconnect)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
