diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2003-06-18 15:19:28 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2003-06-18 15:19:28 +0000 |
| commit | 6b74250915604abb8e84e780238aee611ab9aa41 (patch) | |
| tree | d1730598c8da5d49852c7cc0a5b8496b54da20cc | |
| parent | 1269ac0661a144feda9a62b46846bd0bca2cb7ca (diff) | |
| download | php-git-6b74250915604abb8e84e780238aee611ab9aa41.tar.gz | |
MFH
| -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 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. |