sixd            Thu Jul 24 15:24:14 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/oci8   oci8.c php_oci8.h 
  Log:
  MFH
  
  1. Fix macro version test for constants
  
  2. [DOC] Increase oci8.default_prefetch to 100.  Better out of box 
experience.  Consistent woth PDO_OCI
  
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8.c?r1=1.269.2.16.2.38.2.19&r2=1.269.2.16.2.38.2.20&diff_format=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.269.2.16.2.38.2.19 
php-src/ext/oci8/oci8.c:1.269.2.16.2.38.2.20
--- php-src/ext/oci8/oci8.c:1.269.2.16.2.38.2.19        Thu Jul 17 00:36:02 2008
+++ php-src/ext/oci8/oci8.c     Thu Jul 24 15:24:14 2008
@@ -26,7 +26,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: oci8.c,v 1.269.2.16.2.38.2.19 2008/07/17 00:36:02 sixd Exp $ */
+/* $Id: oci8.c,v 1.269.2.16.2.38.2.20 2008/07/24 15:24:14 sixd Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1046,7 +1046,7 @@
        STD_PHP_INI_ENTRY(      "oci8.ping_interval",                   "60",   
PHP_INI_SYSTEM, ONUPDATELONGFUNC,       ping_interval,                  
zend_oci_globals,       oci_globals)
        STD_PHP_INI_BOOLEAN("oci8.privileged_connect",          "0",    
PHP_INI_SYSTEM, OnUpdateBool,           privileged_connect,             
zend_oci_globals,       oci_globals)
        STD_PHP_INI_ENTRY(      "oci8.statement_cache_size",    "20",   
PHP_INI_SYSTEM, ONUPDATELONGFUNC,       statement_cache_size,   
zend_oci_globals,       oci_globals)
-       STD_PHP_INI_ENTRY(      "oci8.default_prefetch",                "10",   
PHP_INI_SYSTEM, ONUPDATELONGFUNC,       default_prefetch,               
zend_oci_globals,       oci_globals)
+       STD_PHP_INI_ENTRY(      "oci8.default_prefetch",                "100",  
PHP_INI_SYSTEM, ONUPDATELONGFUNC,       default_prefetch,               
zend_oci_globals,       oci_globals)
        STD_PHP_INI_BOOLEAN("oci8.old_oci_close_semantics",     "0",    
PHP_INI_SYSTEM, OnUpdateBool,           
old_oci_close_semantics,zend_oci_globals,       oci_globals)
        STD_PHP_INI_ENTRY(      "oci8.connection_class",                "",     
        PHP_INI_ALL,    OnUpdateString,         connection_class,               
zend_oci_globals,       oci_globals)
        STD_PHP_INI_BOOLEAN("oci8.events",                                      
"0",    PHP_INI_SYSTEM, OnUpdateBool,           events,                         
        zend_oci_globals,       oci_globals)
@@ -1208,7 +1208,7 @@
        REGISTER_LONG_CONSTANT("SQLT_LBI",SQLT_LBI, CONST_CS | 
CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("SQLT_BIN",SQLT_BIN, CONST_CS | 
CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("SQLT_ODT",SQLT_ODT, CONST_CS | 
CONST_PERSISTENT);
-#if defined(HAVE_OCI_INSTANT_CLIENT) || (defined(OCI_MAJOR_VERSION) && 
OCI_MAJOR_VERSION > 10)
+#if defined(HAVE_OCI_INSTANT_CLIENT) || (defined(OCI_MAJOR_VERSION) && 
OCI_MAJOR_VERSION >= 10)
        REGISTER_LONG_CONSTANT("SQLT_BDOUBLE",SQLT_BDOUBLE, CONST_CS | 
CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("SQLT_BFLOAT",SQLT_BFLOAT, CONST_CS | 
CONST_PERSISTENT);
 #endif
@@ -1311,7 +1311,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.269.2.16.2.38.2.19 $");
+       php_info_print_table_row(2, "Revision", "$Revision: 
1.269.2.16.2.38.2.20 $");
 
        snprintf(buf, sizeof(buf), "%ld", OCI_G(num_persistent));
        php_info_print_table_row(2, "Active Persistent Connections", buf);
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/php_oci8.h?r1=1.36.2.2.2.1.2.7&r2=1.36.2.2.2.1.2.8&diff_format=u
Index: php-src/ext/oci8/php_oci8.h
diff -u php-src/ext/oci8/php_oci8.h:1.36.2.2.2.1.2.7 
php-src/ext/oci8/php_oci8.h:1.36.2.2.2.1.2.8
--- php-src/ext/oci8/php_oci8.h:1.36.2.2.2.1.2.7        Thu Jun 19 19:56:11 2008
+++ php-src/ext/oci8/php_oci8.h Thu Jul 24 15:24:14 2008
@@ -25,7 +25,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: php_oci8.h,v 1.36.2.2.2.1.2.7 2008/06/19 19:56:11 sixd Exp $ */
+/* $Id: php_oci8.h,v 1.36.2.2.2.1.2.8 2008/07/24 15:24:14 sixd Exp $ */
 
 #if HAVE_OCI8
 # ifndef PHP_OCI8_H
@@ -46,7 +46,7 @@
  */
 #undef PHP_OCI8_VERSION
 #endif
-#define PHP_OCI8_VERSION "1.3.3"
+#define PHP_OCI8_VERSION "1.3.4-dev"
 
 extern zend_module_entry oci8_module_entry;
 #define phpext_oci8_ptr &oci8_module_entry



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to