[PHP-CVS] cvs: php-src /ext/oci8 config.m4 oci8.c php_oci8.h
sixdMon Mar 9 17:40:59 2009 UTC
Modified files:
/php-src/ext/oci8 config.m4 oci8.c php_oci8.h
Log:
Bug #46623 (phpinfo doesn't show compile time ORACLE_HOME with phpize)
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/config.m4?r1=1.75r2=1.76diff_format=u
Index: php-src/ext/oci8/config.m4
diff -u php-src/ext/oci8/config.m4:1.75 php-src/ext/oci8/config.m4:1.76
--- php-src/ext/oci8/config.m4:1.75 Thu Jun 5 23:40:42 2008
+++ php-src/ext/oci8/config.m4 Mon Mar 9 17:40:59 2009
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.75 2008/06/05 23:40:42 sixd Exp $
+dnl $Id: config.m4,v 1.76 2009/03/09 17:40:59 sixd Exp $
dnl
if test -z $SED; then
@@ -169,6 +169,8 @@
if test $PHP_OCI8 != no test $PHP_OCI8_INSTANT_CLIENT = no; then
+dnl Using an ORACLE_HOME install
+
AC_MSG_CHECKING([Oracle Install Directory])
if test $PHP_OCI8 = yes; then
OCI8_DIR=$ORACLE_HOME
@@ -238,9 +240,15 @@
PHP_SUBST_OLD(OCI8_SHARED_LIBADD)
PHP_SUBST_OLD(OCI8_DIR)
PHP_SUBST_OLD(OCI8_ORACLE_VERSION)
+
+dnl Fix bug #46623
+ AC_DEFINE_UNQUOTED(PHP_OCI8_DEF_DIR, $OCI8_DIR, [ ])
+ AC_DEFINE_UNQUOTED(PHP_OCI8_DEF_SHARED_LIBADD, $OCI8_SHARED_LIBADD, [ ])
elif test $PHP_OCI8 != no test $PHP_OCI8_INSTANT_CLIENT != no; then
+dnl Using an Oracle Instant Client directory
+
AC_CHECK_SIZEOF(long int, 4)
LIBDIR_SUFFIX=
if test $ac_cv_sizeof_long_int = 8 ; then
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8.c?r1=1.359r2=1.360diff_format=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.359 php-src/ext/oci8/oci8.c:1.360
--- php-src/ext/oci8/oci8.c:1.359 Wed Dec 31 11:12:33 2008
+++ php-src/ext/oci8/oci8.c Mon Mar 9 17:40:59 2009
@@ -26,7 +26,7 @@
+--+
*/
-/* $Id: oci8.c,v 1.359 2008/12/31 11:12:33 sebastian Exp $ */
+/* $Id: oci8.c,v 1.360 2009/03/09 17:40:59 sixd Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1017,8 +1017,6 @@
return SUCCESS;
}
-/* - */
-
PHP_RINIT_FUNCTION(oci)
{
OCI_G(debug_mode) = 0; /* start fresh */
@@ -1043,8 +1041,6 @@
PHP_RSHUTDOWN_FUNCTION(oci)
{
- /* Set this to indicate request shutdown for all further processing */
-
#ifdef ZTS
zend_hash_apply_with_argument(EG(regular_list), (apply_func_arg_t)
php_oci_list_helper, (void *)le_descriptor TSRMLS_CC);
zend_hash_apply_with_argument(EG(regular_list), (apply_func_arg_t)
php_oci_list_helper, (void *)le_collection TSRMLS_CC);
@@ -1076,7 +1072,7 @@
php_info_print_table_start();
php_info_print_table_row(2, OCI8 Support, enabled);
php_info_print_table_row(2, Version, PHP_OCI8_VERSION);
- php_info_print_table_row(2, Revision, $Revision: 1.359 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.360 $);
snprintf(buf, sizeof(buf), %ld, OCI_G(num_persistent));
php_info_print_table_row(2, Active Persistent Connections, buf);
@@ -1087,18 +1083,16 @@
#ifdef PHP_OCI8_ORACLE_VERSION
php_info_print_table_row(2, Oracle Version, PHP_OCI8_ORACLE_VERSION);
#endif
-#ifdef PHP_OCI8_DIR
- php_info_print_table_row(2, Compile-time ORACLE_HOME, PHP_OCI8_DIR);
+#ifdef PHP_OCI8_DEF_DIR
+ php_info_print_table_row(2, Compile-time ORACLE_HOME,
PHP_OCI8_DEF_DIR);
#endif
-#ifdef PHP_OCI8_SHARED_LIBADD
- php_info_print_table_row(2, Libraries Used, PHP_OCI8_SHARED_LIBADD);
+#ifdef PHP_OCI8_DEF_SHARED_LIBADD
+ php_info_print_table_row(2, Libraries Used,
PHP_OCI8_DEF_SHARED_LIBADD);
#endif
-#else
-#if defined(HAVE_OCI_INSTANT_CLIENT) defined(OCI_MAJOR_VERSION)
defined(OCI_MINOR_VERSION)
+#elif defined(HAVE_OCI_INSTANT_CLIENT) defined(OCI_MAJOR_VERSION)
defined(OCI_MINOR_VERSION)
snprintf(buf, sizeof(buf), %d.%d, OCI_MAJOR_VERSION,
OCI_MINOR_VERSION);
php_info_print_table_row(2, Oracle Instant Client Version, buf);
#endif
-#endif
php_info_print_table_row(2, Temporary Lob support, enabled);
php_info_print_table_row(2, Collections support, enabled);
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/php_oci8.h?r1=1.51r2=1.52diff_format=u
Index: php-src/ext/oci8/php_oci8.h
diff -u php-src/ext/oci8/php_oci8.h:1.51 php-src/ext/oci8/php_oci8.h:1.52
--- php-src/ext/oci8/php_oci8.h:1.51Wed Dec 31 11:12:33 2008
+++ php-src/ext/oci8/php_oci8.h Mon Mar 9 17:40:59 2009
@@ -25,7 +25,7 @@
+--+
*/
-/* $Id: php_oci8.h,v 1.51 2008/12/31 11:12:33 sebastian Exp $ */
+/* $Id: php_oci8.h,v 1.52 2009/03/09 17:40:59 sixd Exp $ */
#if HAVE_OCI8
# ifndef PHP_OCI8_H
@@ -39,7 +39,7 @@
/*
* The version of the OCI8 extension.
*/
-#define PHP_OCI8_VERSION 1.3.4
+#define PHP_OCI8_VERSION 1.3.5-dev
extern zend_module_entry oci8_module_entry;
#define phpext_oci8_ptr oci8_module_entry
--
PHP CVS Mailing List
[PHP-CVS] cvs: php-src /ext/oci8 config.m4 oci8.c php_oci8_int.h
tony2001Mon Feb 12 09:36:11 2007 UTC
Modified files:
/php-src/ext/oci8 oci8.c config.m4 php_oci8_int.h
Log:
typofixes and other improvements by Chris Jones
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8.c?r1=1.328r2=1.329diff_format=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.328 php-src/ext/oci8/oci8.c:1.329
--- php-src/ext/oci8/oci8.c:1.328 Wed Jan 31 12:45:55 2007
+++ php-src/ext/oci8/oci8.c Mon Feb 12 09:36:11 2007
@@ -26,7 +26,7 @@
+--+
*/
-/* $Id: oci8.c,v 1.328 2007/01/31 12:45:55 tony2001 Exp $ */
+/* $Id: oci8.c,v 1.329 2007/02/12 09:36:11 tony2001 Exp $ */
/* TODO
*
* file://localhost/www/docs/oci10/ociaahan.htm#423823 - implement lob_empty()
with OCI_ATTR_LOBEMPTY
@@ -674,7 +674,7 @@
php_info_print_table_start();
php_info_print_table_row(2, OCI8 Support, enabled);
php_info_print_table_row(2, Version, 1.2.2);
- php_info_print_table_row(2, Revision, $Revision: 1.328 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.329 $);
sprintf(buf, %ld, OCI_G(num_persistent));
php_info_print_table_row(2, Active Persistent Connections, buf);
@@ -1088,7 +1088,7 @@
size_t rsize = 0;
sword result;
- PHP_OCI_CALL_RETURN(result,
OCINlsEnvironmentVariableGet, (charsetid_nls_lang, 0, OCI_NLS_CHARSET_ID, 0,
rsize))
+ PHP_OCI_CALL_RETURN(result,
OCINlsEnvironmentVariableGet, (charsetid_nls_lang, 0, OCI_NLS_CHARSET_ID, 0,
rsize));
if (result != OCI_SUCCESS) {
charsetid_nls_lang = 0;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/config.m4?r1=1.62r2=1.63diff_format=u
Index: php-src/ext/oci8/config.m4
diff -u php-src/ext/oci8/config.m4:1.62 php-src/ext/oci8/config.m4:1.63
--- php-src/ext/oci8/config.m4:1.62 Thu Jun 22 20:28:51 2006
+++ php-src/ext/oci8/config.m4 Mon Feb 12 09:36:11 2007
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.62 2006/06/22 20:28:51 tony2001 Exp $
+dnl $Id: config.m4,v 1.63 2007/02/12 09:36:11 tony2001 Exp $
dnl
if test -z $SED; then
@@ -99,7 +99,7 @@
[ --with-oci8[=DIR] Include Oracle (OCI8) support.
The default DIR is ORACLE_HOME.
Use --with-oci8=instantclient,/path/to/oic/lib
- to use Oracle Instant Client installation])
+ to use an Oracle Instant Client installation])
AC_MSG_CHECKING([checking PHP version])
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/php_oci8_int.h?r1=1.30r2=1.31diff_format=u
Index: php-src/ext/oci8/php_oci8_int.h
diff -u php-src/ext/oci8/php_oci8_int.h:1.30
php-src/ext/oci8/php_oci8_int.h:1.31
--- php-src/ext/oci8/php_oci8_int.h:1.30Wed Jan 31 10:36:20 2007
+++ php-src/ext/oci8/php_oci8_int.h Mon Feb 12 09:36:11 2007
@@ -25,7 +25,7 @@
+--+
*/
-/* $Id: php_oci8_int.h,v 1.30 2007/01/31 10:36:20 tony2001 Exp $ */
+/* $Id: php_oci8_int.h,v 1.31 2007/02/12 09:36:11 tony2001 Exp $ */
#if HAVE_OCI8
# ifndef PHP_OCI8_INT_H
@@ -231,41 +231,47 @@
/* {{{ macros */
#define PHP_OCI_CALL(func, params) \
- OCI_G(in_call) = 1; \
- func params; \
- OCI_G(in_call) = 0; \
- if (OCI_G(debug_mode)) { \
- php_printf (OCI8 DEBUG: #func at (%s:%d) \n, __FILE__,
__LINE__); \
- }
+ do { \
+ OCI_G(in_call) = 1; \
+ func params; \
+ OCI_G(in_call) = 0; \
+ if (OCI_G(debug_mode)) { \
+ php_printf (OCI8 DEBUG: #func at (%s:%d) \n,
__FILE__, __LINE__); \
+ } \
+ } while (0)
#define PHP_OCI_CALL_RETURN(__retval, func, params) \
- OCI_G(in_call) = 1; \
- __retval = func params; \
- OCI_G(in_call) = 0; \
- if (OCI_G(debug_mode)) { \
- php_printf (OCI8 DEBUG: #func at (%s:%d) \n, __FILE__,
__LINE__); \
- }
+ do { \
+ OCI_G(in_call) = 1; \
+ __retval = func params; \
+ OCI_G(in_call) = 0; \
+ if (OCI_G(debug_mode)) { \
+ php_printf (OCI8 DEBUG: #func at (%s:%d) \n,
__FILE__, __LINE__); \
+ } \
+ } while (0)
#define PHP_OCI_HANDLE_ERROR(connection, errcode) \
-{ \
- switch (errcode) { \
- case 1013: \
- zend_bailout(); \
+ do { \
+ switch (errcode) { \
+ case 1013: \
+ zend_bailout(); \
break; \
- case 22: \
- case 1012: \
- case 3113: \
- case 604: \
- case 1041: \
-
[PHP-CVS] cvs: php-src /ext/oci8 config.m4 oci8.c
sniper Thu Jan 15 01:30:25 2004 EDT Modified files: /php-src/ext/oci8 config.m4 oci8.c Log: Fix typo Index: php-src/ext/oci8/config.m4 diff -u php-src/ext/oci8/config.m4:1.48 php-src/ext/oci8/config.m4:1.49 --- php-src/ext/oci8/config.m4:1.48 Tue Dec 16 10:58:10 2003 +++ php-src/ext/oci8/config.m4 Thu Jan 15 01:30:22 2004 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.48 2003/12/16 15:58:10 tony2001 Exp $ +dnl $Id: config.m4,v 1.49 2004/01/15 06:30:22 sniper Exp $ dnl AC_DEFUN(PHP_OCI_IF_DEFINED,[ @@ -143,7 +143,7 @@ dnl PHP_CHECK_LIBRARY(clntsh, OCICollAssign, [ -AC_DEFINE(HAVE_OCI8_COLLECTIONS,1,[ ]) +AC_DEFINE(PHP_OCI8_HAVE_COLLECTIONS,1,[ ]) ], [], [ -L$OCI8_DIR/lib $OCI8_SHARED_LIBADD ]) Index: php-src/ext/oci8/oci8.c diff -u php-src/ext/oci8/oci8.c:1.232 php-src/ext/oci8/oci8.c:1.233 --- php-src/ext/oci8/oci8.c:1.232 Thu Jan 8 03:16:32 2004 +++ php-src/ext/oci8/oci8.c Thu Jan 15 01:30:23 2004 @@ -22,7 +22,7 @@ +--+ */ -/* $Id: oci8.c,v 1.232 2004/01/08 08:16:32 andi Exp $ */ +/* $Id: oci8.c,v 1.233 2004/01/15 06:30:23 sniper Exp $ */ /* TODO list: * @@ -784,7 +784,7 @@ php_info_print_table_start(); php_info_print_table_row(2, OCI8 Support, enabled); - php_info_print_table_row(2, Revision, $Revision: 1.232 $); + php_info_print_table_row(2, Revision, $Revision: 1.233 $); sprintf(buf, %ld, num_persistent); php_info_print_table_row(2, Active Persistent Links, buf); @@ -803,7 +803,7 @@ php_info_print_table_row(2, Temporary Lob support, disabled ); #endif -#ifdef HAVE_OCI8_COLLECTIONS +#ifdef PHP_OCI8_HAVE_COLLECTIONS php_info_print_table_row(2, Collections support, enabled ); #else php_info_print_table_row(2, Collections support, disabled ); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/oci8 config.m4 oci8.c
tony2001Tue Dec 16 10:58:11 2003 EDT
Modified files:
/php-src/ext/oci8 config.m4 oci8.c
Log:
fix bug #26133 (thanks to Harald)
rename constant and add library check to config.m4
add info lines to see if Collection Temp Lob support enabled or not
add OCI_THREADED to use thread safe OCI mode with ZTS (should fix bug #26558)
Index: php-src/ext/oci8/config.m4
diff -u php-src/ext/oci8/config.m4:1.47 php-src/ext/oci8/config.m4:1.48
--- php-src/ext/oci8/config.m4:1.47 Fri Oct 3 01:24:25 2003
+++ php-src/ext/oci8/config.m4 Tue Dec 16 10:58:10 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.47 2003/10/03 05:24:25 sniper Exp $
+dnl $Id: config.m4,v 1.48 2003/12/16 15:58:10 tony2001 Exp $
dnl
AC_DEFUN(PHP_OCI_IF_DEFINED,[
@@ -138,10 +138,22 @@
-L$OCI8_DIR/lib $OCI8_SHARED_LIBADD
])
+ dnl
+ dnl Check if we have collections
+ dnl
+ PHP_CHECK_LIBRARY(clntsh, OCICollAssign,
+ [
+AC_DEFINE(HAVE_OCI8_COLLECTIONS,1,[ ])
+ ], [], [
+-L$OCI8_DIR/lib $OCI8_SHARED_LIBADD
+ ])
+
+
PHP_NEW_EXTENSION(oci8, oci8.c, $ext_shared)
AC_DEFINE(HAVE_OCI8,1,[ ])
PHP_SUBST_OLD(OCI8_SHARED_LIBADD)
PHP_SUBST_OLD(OCI8_DIR)
PHP_SUBST_OLD(OCI8_VERSION)
+
fi
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.222 php-src/ext/oci8/oci8.c:1.223
--- php-src/ext/oci8/oci8.c:1.222 Tue Dec 16 10:48:20 2003
+++ php-src/ext/oci8/oci8.c Tue Dec 16 10:58:10 2003
@@ -22,7 +22,7 @@
+--+
*/
-/* $Id: oci8.c,v 1.222 2003/12/16 15:48:20 tony2001 Exp $ */
+/* $Id: oci8.c,v 1.223 2003/12/16 15:58:10 tony2001 Exp $ */
/* TODO list:
*
@@ -66,9 +66,6 @@
#include ext/standard/info.h
#include php_ini.h
-/* #define HAVE_OCI8_TEMP_LOB 1 */
-#define WITH_COLLECTIONS 1
-
#if HAVE_OCI8
#include php_oci8.h
@@ -84,13 +81,13 @@
static int le_conn;
static int le_stmt;
static int le_desc;
-#ifdef WITH_COLLECTIONS
+#ifdef PHP_OCI8_HAVE_COLLECTIONS
static int le_coll;
#endif
static int le_server;
static int le_session;
static zend_class_entry *oci_lob_class_entry_ptr;
-#ifdef WITH_COLLECTIONS
+#ifdef PHP_OCI8_HAVE_COLLECTIONS
static zend_class_entry *oci_coll_class_entry_ptr;
#endif
@@ -193,7 +190,7 @@
static void _oci_conn_list_dtor(oci_connection *connection TSRMLS_DC);
static void _oci_stmt_list_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC);
static void _oci_descriptor_list_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC);
-#ifdef WITH_COLLECTIONS
+#ifdef PHP_OCI8_HAVE_COLLECTIONS
static void _oci_coll_list_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC);
#endif
static void _oci_server_list_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC);
@@ -207,7 +204,7 @@
static oci_connection *oci_get_conn(zval ** TSRMLS_DC);
static oci_statement *oci_get_stmt(zval ** TSRMLS_DC);
static oci_descriptor *oci_get_desc(int TSRMLS_DC);
-#ifdef WITH_COLLECTIONS
+#ifdef PHP_OCI8_HAVE_COLLECTIONS
/* Questionable name. Very close to oci_get_col */
static oci_collection *oci_get_coll(int TSRMLS_DC);
#endif
@@ -297,7 +294,7 @@
PHP_FUNCTION(ociwritetemporarylob);
PHP_FUNCTION(ocicloselob);
#endif
-#ifdef WITH_COLLECTIONS
+#ifdef PHP_OCI8_HAVE_COLLECTIONS
PHP_FUNCTION(ocinewcollection);
PHP_FUNCTION(ocifreecollection);
PHP_FUNCTION(ocicollappend);
@@ -327,7 +324,7 @@
RETURN_FALSE; \
}
-#ifdef WITH_COLLECTIONS
+#ifdef PHP_OCI8_HAVE_COLLECTIONS
#define OCI_GET_COLL(collection,index) \
collection = oci_get_coll(index TSRMLS_CC); \
if (collection == NULL) { \
@@ -418,7 +415,7 @@
PHP_FE(ocinewdescriptor, NULL)
PHP_FE(ocisetprefetch, NULL)
PHP_FE(ocipasswordchange, NULL)
-#ifdef WITH_COLLECTIONS
+#ifdef PHP_OCI8_HAVE_COLLECTIONS
PHP_FE(ocifreecollection, NULL)
PHP_FE(ocicollappend, NULL)
PHP_FE(ocicollgetelem, NULL)
@@ -461,7 +458,7 @@
{NULL,NULL,NULL}
};
-#ifdef WITH_COLLECTIONS
+#ifdef PHP_OCI8_HAVE_COLLECTIONS
static zend_function_entry php_oci_coll_class_functions[] = {
PHP_FALIAS(append,ocicollappend,NULL)
PHP_FALIAS(getelem, ocicollgetelem, NULL)
@@ -534,28 +531,34 @@
PHP_MINIT_FUNCTION(oci)
{
zend_class_entry oci_lob_class_entry;
-#ifdef WITH_COLLECTIONS
+#ifdef PHP_OCI8_HAVE_COLLECTIONS
zend_class_entry oci_coll_class_entry;
#endif
#ifdef HAVE_OCI8_SHARED_MODE
-#ifdef WITH_COLLECTIONS
-#define PHP_OCI_INIT_MODE OCI_SHARED | OCI_OBJECT
+#ifdef PHP_OCI8_HAVE_COLLECTIONS
+#define PHP_OCI_INIT_MODE_TMP OCI_SHARED | OCI_OBJECT
#else
-#define PHP_OCI_INIT_MODE OCI_SHARED
+#define PHP_OCI_INIT_MODE_TMP OCI_SHARED
#endif
#else
-#ifdef WITH_COLLECTIONS
-#define PHP_OCI_INIT_MODE OCI_DEFAULT | OCI_OBJECT
+#ifdef PHP_OCI8_HAVE_COLLECTIONS
+#define PHP_OCI_INIT_MODE_TMP OCI_DEFAULT | OCI_OBJECT
#else
-#define PHP_OCI_INIT_MODE OCI_DEFAULT
+#define
Re: [PHP-CVS] cvs: php-src /ext/oci8 config.m4 oci8.c
On December 16, 2003 10:58 am, Antony Dovgal wrote: tony2001 Tue Dec 16 10:58:11 2003 EDT Please don't forget to MFH (backport the fix into the 4.3 tree). Ilia -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/oci8 config.m4 oci8.c
On Tue, 16 Dec 2003 11:18:53 -0500 Ilia Alshanetsky [EMAIL PROTECTED] wrote: On December 16, 2003 10:58 am, Antony Dovgal wrote: tony2001Tue Dec 16 10:58:11 2003 EDT Please don't forget to MFH (backport the fix into the 4.3 tree). should I port all changes to PHP_4_3 branch or only bugfixes? --- WBR, Antony Dovgal aka tony2001 [EMAIL PROTECTED] -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
