From: Antony Dovgal <tony2001@php.net>
Date: Mon, 2 Oct 2006 22:09:49 +0000 (+0000)
Subject: MFH: fix #38996 (PDO_MYSQL doesn't check connections for liveness)
X-Git-Tag: php-5.2.0RC5~43
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=588c45ea8d9404cfb7fae3daa9acb224a80ff9e4;p=php

MFH: fix #38996 (PDO_MYSQL doesn't check connections for liveness)
---

diff --git a/NEWS b/NEWS
index 9ba7c7fe7b..63314e3d71 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,7 @@ PHP                                                                        NEWS
 - Fixed bug #39003 (__autoload() is called for type hinting). (Dmitry, Tony)
 - Fixed bug #39001 (ReflectionProperty returns incorrect declaring class for 
   protected properties). (Tony)
+- Fixed bug #38996 (PDO_MYSQL doesn't check connections for liveness). (Tony)
 - Fixed bug #38993 (Fixed safe_mode/open_basedir checks for
   session.save_path, allowing them to account for extra parameters). (Ilia)
 - Fixed bug #38981 (using FTP URLs in get_headers() causes crash). (Tony)
diff --git a/ext/pdo_mysql/mysql_driver.c b/ext/pdo_mysql/mysql_driver.c
index 51e502ccaa..9b77ea5537 100755
--- a/ext/pdo_mysql/mysql_driver.c
+++ b/ext/pdo_mysql/mysql_driver.c
@@ -379,6 +379,34 @@ static int pdo_mysql_get_attribute(pdo_dbh_t *dbh, long attr, zval *return_value
 	return 1;
 }
 
+static int pdo_mysql_check_liveness(pdo_dbh_t *dbh TSRMLS_DC) /* {{{ */
+{
+	pdo_mysql_db_handle *H = (pdo_mysql_db_handle *)dbh->driver_data;
+#if MYSQL_VERSION_ID <= 32230
+	void (*handler) (int);
+	unsigned int my_errno;
+#endif
+
+#if MYSQL_VERSION_ID > 32230
+	if (mysql_ping(H->server)) {
+		return FAILURE;
+	}
+#else /* no mysql_ping() */
+	handler=signal(SIGPIPE, SIG_IGN);
+	mysql_stat(H->server);
+	switch (mysql_errno(H->server)) {
+		case CR_SERVER_GONE_ERROR:
+		/* case CR_SERVER_LOST: I'm not sure this means the same as "gone" for us */
+			signal(SIGPIPE, handler);
+			return FAILURE;
+		default:
+			break;
+	}
+	signal(SIGPIPE, handler);
+#endif /* end mysql_ping() */
+	return SUCCESS;
+} 
+/* }}} */
 
 static struct pdo_dbh_methods mysql_methods = {
 	mysql_handle_closer,
@@ -392,7 +420,7 @@ static struct pdo_dbh_methods mysql_methods = {
 	pdo_mysql_last_insert_id,
 	pdo_mysql_fetch_error_func,
 	pdo_mysql_get_attribute,
-	NULL /* check_liveness: TODO: ping */
+	pdo_mysql_check_liveness
 };
 
 #ifndef PDO_MYSQL_UNIX_ADDR