From: Ilia Alshanetsky Date: Wed, 18 Jun 2003 15:19:28 +0000 (+0000) Subject: MFH X-Git-Tag: php-4.3.3RC1~6 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6b74250915604abb8e84e780238aee611ab9aa41;p=php MFH --- diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index 6baf46edde..c37c1aa56a 100644 --- 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 deae088cab..c04f9532e7 100644 --- 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 a078ec4f73..8a405411de 100644 --- 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.