Patch make_resuming_pdo_oci_sessions for PDO OCI Bug #55768

Patch version 2011-09-23 13:30 UTC

Obsoleted by patches:

• make_resuming_pdo_oci_sessions, revision 2011-09-26 08:31 UTC

• 2011-09-27 08:15 UTC [diff to current]
• 2011-09-27 06:01 UTC [diff to current]
• 2011-09-26 08:33 UTC [diff to current]
• 2011-09-26 08:31 UTC [diff to current]
• 2011-09-23 13:30 UTC [diff to current]

Developer: mikhail.v.gavrilov@gmail.com

Index: oci_driver.c
===================================================================
--- oci_driver.c	(revision 317201)
+++ oci_driver.c	(working copy)
@@ -515,6 +515,22 @@
 
 }
 /* }}} */
+static int pdo_oci_check_liveness(pdo_dbh_t *dbh TSRMLS_DC)
+{
+	pdo_oci_db_handle *H = (pdo_oci_db_handle *)dbh->driver_data;
+#if ((OCI_MAJOR_VERSION > 10) || ((OCI_MAJOR_VERSION == 10) && (OCI_MINOR_VERSION >= 2)))	/* OCIPing available 10.2 onwards */
+	H->last_err = OCIPing (H->svc, H->err, OCI_DEFAULT);
+#else
+	char version[256];
+	/* use good old OCIServerVersion() */
+	H->last_err = OCIServerVersion (H->svc, H->err, (text *)version, sizeof(version), OCI_HTYPE_SVCCTX);
+#endif
+	if (H->last_err == OCI_SUCCESS) {
+		return SUCCESS;
+	}
+	return FAILURE;
+}
+/* }}} */
 
 static struct pdo_dbh_methods oci_methods = {
 	oci_handle_closer,
@@ -528,7 +544,7 @@
 	NULL,
 	pdo_oci_fetch_error_func,
 	oci_handle_get_attribute,
-	NULL,	/* check_liveness */
+	pdo_oci_check_liveness,	/* check_liveness */
 	NULL	/* get_driver_methods */
 };