Added php.ini option "mysql_connection.timeout"

diff --git a/php.ini-dist b/php.ini-dist
index 953125b9aadbc78f887480e13e7553ed2e7cdf95..d3ebc6357f76fe6e2031bb5490baeaa10af69718 100644 (file)
--- a/php.ini-dist
+++ b/php.ini-dist
@@ -603,6 +603,9 @@ mysql.default_user =
 ; file will be able to reveal the password as well.
 mysql.default_password =
 
+; Maximum time (in secondes) for connect timeout. -1 means no limimt
+mysql.connect_timeout = -1
+
 [mSQL]
 ; Allow or prevent persistent links.
 msql.allow_persistent = On

diff --git a/php.ini-recommended b/php.ini-recommended
index 6b2422fa2a74cda673ae681a2a70b8cd1e5415d0..2cc3ca1b57f36fae37168439599bd350e126c5fa 100644 (file)
--- a/php.ini-recommended
+++ b/php.ini-recommended
@@ -608,6 +608,9 @@ mysql.default_user =
 ; file will be able to reveal the password as well.
 mysql.default_password =
 
+; Maximum time (in secondes) for connect timeout. -1 means no limimt
+mysql.connect_timeout = -1
+
 [mSQL]
 ; Allow or prevent persistent links.
 msql.allow_persistent = On