iliaa Wed Jun 18 11:19:16 2003 EDT
Modified files:
/php4 php.ini-dist php.ini-recommended
/php4/ext/mysql php_mysql.c
Log:
Make the default mysql connection timeout 60 seconds rather then unlimited.
Index: php4/php.ini-dist
diff -u php4/php.ini-dist:1.193 php4/php.ini-dist:1.194
--- php4/php.ini-dist:1.193 Tue Jun 3 06:06:45 2003
+++ php4/php.ini-dist Wed Jun 18 11:19:16 2003
@@ -670,7 +670,7 @@
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.
Index: php4/php.ini-recommended
diff -u php4/php.ini-recommended:1.138 php4/php.ini-recommended:1.139
--- php4/php.ini-recommended:1.138 Tue Jun 3 06:06:45 2003
+++ php4/php.ini-recommended Wed Jun 18 11:19:16 2003
@@ -685,7 +685,7 @@
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.
Index: php4/ext/mysql/php_mysql.c
diff -u php4/ext/mysql/php_mysql.c:1.194 php4/ext/mysql/php_mysql.c:1.195
--- php4/ext/mysql/php_mysql.c:1.194 Tue Jun 10 16:03:33 2003
+++ php4/ext/mysql/php_mysql.c Wed Jun 18 11:19:16 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mysql.c,v 1.194 2003/06/10 20:03:33 imajes Exp $ */
+/* $Id: php_mysql.c,v 1.195 2003/06/18 15:19:16 iliaa Exp $ */
/* TODO:
*
@@ -303,7 +303,7 @@
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()
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
