diff options
| -rw-r--r-- | ext/mysql/php_mysql.c | 2 | ||||
| -rw-r--r-- | php.ini-dist | 2 | ||||
| -rw-r--r-- | php.ini-recommended | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index eae9991c98..091dfe8c2d 100644 --- a/ext/mysql/php_mysql.c +++ b/ext/mysql/php_mysql.c @@ -303,7 +303,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, OnUpdateLong, connect_timeout, zend_mysql_globals, mysql_globals) + STD_PHP_INI_ENTRY("mysql.connect_timeout", "60", PHP_INI_ALL, OnUpdateLong, connect_timeout, zend_mysql_globals, mysql_globals) STD_PHP_INI_BOOLEAN("mysql.trace_mode", "0", PHP_INI_ALL, OnUpdateLong, trace_mode, zend_mysql_globals, mysql_globals) PHP_INI_END() /* }}} */ diff --git a/php.ini-dist b/php.ini-dist index 643588c21e..8fb1ef5c2e 100644 --- a/php.ini-dist +++ b/php.ini-dist @@ -670,7 +670,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 21e5c4f59c..8778334570 100644 --- a/php.ini-recommended +++ b/php.ini-recommended @@ -685,7 +685,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. |