[PHP-CVS] cvs: php-src(PHP_5_3) /ext/pdo_oci oci_driver.c

2009-05-12 Thread Matteo Beccati 
mbeccatiTue May 12 21:53:19 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/pdo_ocioci_driver.c 
  Log:
  MFH
  - Fixed bug #48070
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_oci/oci_driver.c?r1=1.24.2.4.2.7.2.4r2=1.24.2.4.2.7.2.5diff_format=u
Index: php-src/ext/pdo_oci/oci_driver.c
diff -u php-src/ext/pdo_oci/oci_driver.c:1.24.2.4.2.7.2.4 
php-src/ext/pdo_oci/oci_driver.c:1.24.2.4.2.7.2.5
--- php-src/ext/pdo_oci/oci_driver.c:1.24.2.4.2.7.2.4   Wed Dec 31 11:15:41 2008
+++ php-src/ext/pdo_oci/oci_driver.cTue May 12 21:53:18 2009
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: oci_driver.c,v 1.24.2.4.2.7.2.4 2008/12/31 11:15:41 sebastian Exp $ */
+/* $Id: oci_driver.c,v 1.24.2.4.2.7.2.5 2009/05/12 21:53:18 mbeccati Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -70,15 +70,13 @@
S = (pdo_oci_stmt*)stmt-driver_data;
einfo = S-einfo;
pdo_err = stmt-error_code;
-   if (einfo-errmsg) {
-   efree(einfo-errmsg);
-   }
}
else {
einfo = H-einfo;
-   if (einfo-errmsg) {
-   pefree(einfo-errmsg, dbh-is_persistent);
-   }
+   }
+
+   if (einfo-errmsg) {
+   pefree(einfo-errmsg, dbh-is_persistent);
}
 
einfo-errmsg = NULL;



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/pdo_oci oci_driver.c

2008-03-08 Thread Felipe Pena 
felipe  Sat Mar  8 14:03:21 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/pdo_ocioci_driver.c 
  Log:
  MFB: Fixed bug #44373 (PDO_OCI extension compile failed)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_oci/oci_driver.c?r1=1.24.2.4.2.7.2.2r2=1.24.2.4.2.7.2.3diff_format=u
Index: php-src/ext/pdo_oci/oci_driver.c
diff -u php-src/ext/pdo_oci/oci_driver.c:1.24.2.4.2.7.2.2 
php-src/ext/pdo_oci/oci_driver.c:1.24.2.4.2.7.2.3
--- php-src/ext/pdo_oci/oci_driver.c:1.24.2.4.2.7.2.2   Mon Dec 31 07:17:12 2007
+++ php-src/ext/pdo_oci/oci_driver.cSat Mar  8 14:03:20 2008
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: oci_driver.c,v 1.24.2.4.2.7.2.2 2007/12/31 07:17:12 sebastian Exp $ */
+/* $Id: oci_driver.c,v 1.24.2.4.2.7.2.3 2008/03/08 14:03:20 felipe Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -494,7 +494,7 @@
OCIClientVersion(major, minor, update, patch, 
port_update);
slprintf(verstr, sizeof(verstr), %d.%d.%d.%d.%d, 
major, minor, update, patch, port_update);
ZVAL_STRING(return_value, verstr, 1);
-#elif PHP_PDO_OCI_CLIENT_VERSION
+#elif defined(PHP_PDO_OCI_CLIENT_VERSION)
/* Compile time client version */
ZVAL_STRING(return_value, PHP_PDO_OCI_CLIENT_VERSION, 
1);
 #else



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/pdo_oci oci_driver.c

2007-12-10 Thread Christopher Jones 
sixdTue Dec 11 06:57:40 2007 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/pdo_ocioci_driver.c 
  Log:
  Sync with 5.2
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_oci/oci_driver.c?r1=1.24.2.4.2.7r2=1.24.2.4.2.7.2.1diff_format=u
Index: php-src/ext/pdo_oci/oci_driver.c
diff -u php-src/ext/pdo_oci/oci_driver.c:1.24.2.4.2.7 
php-src/ext/pdo_oci/oci_driver.c:1.24.2.4.2.7.2.1
--- php-src/ext/pdo_oci/oci_driver.c:1.24.2.4.2.7   Fri Aug 31 21:08:48 2007
+++ php-src/ext/pdo_oci/oci_driver.cTue Dec 11 06:57:39 2007
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: oci_driver.c,v 1.24.2.4.2.7 2007/08/31 21:08:48 sixd Exp $ */
+/* $Id: oci_driver.c,v 1.24.2.4.2.7.2.1 2007/12/11 06:57:39 sixd Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -494,9 +494,12 @@
OCIClientVersion(major, minor, update, patch, 
port_update);
slprintf(verstr, sizeof(verstr), %d.%d.%d.%d.%d, 
major, minor, update, patch, port_update);
ZVAL_STRING(return_value, verstr, 1);
-#else
+#elif PHP_PDO_OCI_CLIENT_VERSION
/* Compile time client version */
ZVAL_STRING(return_value, PHP_PDO_OCI_CLIENT_VERSION, 
1);
+#else
+   return FALSE;
+
 #endif /* Check for OCIClientVersion() support */
 
return TRUE;

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