MFH

diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index 6baf46edde2a7015e7c0783585111068fd241ca6..c37c1aa56a9528afcf3ca50fb89e25cb87a78879 100644 (file)
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -315,7 +315,7 @@ PHP_INI_BEGIN()
        STD_PHP_INI_ENTRY("mysql.default_password",             NULL,   PHP_INI_ALL,            OnUpdateString,         default_password,       zend_mysql_globals,             mysql_globals)
        PHP_INI_ENTRY("mysql.default_port",                             NULL,   PHP_INI_ALL,            OnMySQLPort)
        STD_PHP_INI_ENTRY("mysql.default_socket",               NULL,   PHP_INI_ALL,            OnUpdateStringUnempty,  default_socket, zend_mysql_globals,             mysql_globals)
-       STD_PHP_INI_ENTRY("mysql.connect_timeout",              "-1",   PHP_INI_ALL,            OnUpdateInt,            connect_timeout,        zend_mysql_globals,             mysql_globals)
+       STD_PHP_INI_ENTRY("mysql.connect_timeout",              "60",   PHP_INI_ALL,            OnUpdateInt,            connect_timeout,        zend_mysql_globals,             mysql_globals)
        STD_PHP_INI_BOOLEAN("mysql.trace_mode",                 "0",    PHP_INI_ALL,            OnUpdateInt,            trace_mode,             zend_mysql_globals,             mysql_globals)
 PHP_INI_END()
 /* }}} */

diff --git a/php.ini-dist b/php.ini-dist
index deae088cab7b17ef3da77a9191bd78f54621feeb..c04f9532e748ad18b54d787d88f88fefad338b43 100644 (file)
--- a/php.ini-dist
+++ b/php.ini-dist
@@ -666,7 +666,7 @@ mysql.default_user =
 mysql.default_password =
 
 ; Maximum time (in secondes) for connect timeout. -1 means no limimt
-mysql.connect_timeout = -1
+mysql.connect_timeout = 60
 
 ; Trace mode. When trace_mode is active (=On), warnings for table/index scans and
 ; SQL-Erros will be displayed.

diff --git a/php.ini-recommended b/php.ini-recommended
index a078ec4f737615ad5eb1f321c3114133816013c3..8a405411de734f5f7a2e4bc3447b497ef76b6a74 100644 (file)
--- a/php.ini-recommended
+++ b/php.ini-recommended
@@ -681,7 +681,7 @@ mysql.default_user =
 mysql.default_password =
 
 ; Maximum time (in secondes) for connect timeout. -1 means no limimt
-mysql.connect_timeout = -1
+mysql.connect_timeout = 60
 
 ; Trace mode. When trace_mode is active (=On), warnings for table/index scans and
 ; SQL-Erros will be displayed.