From: Ilia Alshanetsky <iliaa@php.net>
Date: Wed, 19 May 2004 20:34:57 +0000 (+0000)
Subject: Added support for setting timeout value.
X-Git-Tag: RELEASE_0_1~93
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f4b5abc94859e9a55b734ad096e87a057e5d8966;p=php

Added support for setting timeout value.
---

diff --git a/ext/pdo_mysql/mysql_driver.c b/ext/pdo_mysql/mysql_driver.c
index 3f64a8326f..bc618f4529 100755
--- a/ext/pdo_mysql/mysql_driver.c
+++ b/ext/pdo_mysql/mysql_driver.c
@@ -143,6 +143,17 @@ static int pdo_mysql_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_
 	/* handle for the server */
 	H->server = mysql_init(NULL);
 	dbh->driver_data = H;
+
+	/* handle MySQL options */
+	if (driver_options) {
+		long connect_timeout = pdo_attr_lval(driver_options, PDO_ATTR_TIMEOUT, 30 TSRMLS_CC);
+
+		if (mysql_options(H->server, MYSQL_OPT_CONNECT_TIMEOUT, (const char *)&connect_timeout)) {
+			pdo_mysql_error(H);
+			goto cleanup;
+		}
+	}
+
 	if(vars[2].optval && strcmp("localhost", vars[2].optval)) {
 		host = vars[2].optval;
 		port = atoi(vars[3].optval);