From: Zak Greant <zak@php.net>
Date: Tue, 12 Nov 2002 01:41:16 +0000 (+0000)
Subject: Modified php_mysql_do_connect() as suggested by Nick Gaugler - using
X-Git-Tag: php-4.3.0RC1~95
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c29f1aa468f661bc34174a7726abdf785fff36e4;p=php

Modified php_mysql_do_connect() as suggested by Nick Gaugler - using
mysql_ping() as a more efficient alternative to using mysql_stat() to
check if the server is alive and then calling mysql_(real_)?connect() to
reconnect.

Simple tests of opening pconnects indicate that only about 10k of data per
ping needs to be returned to the client per connection check, rather than
about 110k per status check.
---

diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index 034c4dc5f3..5618cbd86c 100644
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -696,11 +696,19 @@ static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
 			}
 			MySG(num_persistent)++;
 			MySG(num_links)++;
-		} else {  /* we do */
+		} else {  /* The link is in our list of persistent connections */
 			if (Z_TYPE_P(le) != le_plink) {
 				MYSQL_DO_CONNECT_RETURN_FALSE();
 			}
 			/* ensure that the link did not die */
+#if MYSQL_VERSION_ID > 32230 /* Use mysql_ping to ensure link is alive (and to reconnect if needed) */
+			if (mysql_ping(le->ptr)) {
+					php_error(E_WARNING, "%s: Link to server lost, unable to reconnect", get_active_function_name(TSRMLS_C));
+					zend_hash_del(&EG(persistent_list), hashed_details, hashed_details_length+1);
+					efree(hashed_details);
+					MYSQL_DO_CONNECT_RETURN_FALSE();
+			}
+#else	/* Use mysql_stat() to check if server is alive */
 			handler=signal(SIGPIPE, SIG_IGN);
 #if defined(HAVE_MYSQL_ERRNO) && defined(CR_SERVER_GONE_ERROR)
 			mysql_stat(le->ptr);
@@ -721,6 +729,8 @@ static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
 				}
 			}
 			signal(SIGPIPE, handler);
+#endif /* end Use mysql_ping ... */
+
 			mysql = (php_mysql_conn *) le->ptr;
 		}
 		ZEND_REGISTER_RESOURCE(return_value, mysql, le_plink);