cvs: php4(PHP_4_3) /ext/mysql php_mysql.c

From: Date: Wed, 28 May 2003 16:18:14 +0000
Subject: cvs: php4(PHP_4_3) /ext/mysql php_mysql.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-21299@lists.php.net to get a copy of this message
rasmus Wed May 28 12:18:14 2003 EDT Modified files: (Branch: PHP_4_3) /php4/ext/mysql php_mysql.c Log: I see no reason not to allow people to set the timeout on a mysql_connect from inside a script with ini_set(). We allow user-settable timeouts on other socket connections so having this as a system-settable only directive doesn't make much sense to me. Index: php4/ext/mysql/php_mysql.c diff -u php4/ext/mysql/php_mysql.c:1.174.2.12 php4/ext/mysql/php_mysql.c:1.174.2.13 --- php4/ext/mysql/php_mysql.c:1.174.2.12 Fri May 16 15:07:57 2003 +++ php4/ext/mysql/php_mysql.c Wed May 28 12:18:14 2003 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mysql.c,v 1.174.2.12 2003/05/16 19:07:57 derick Exp $ */ +/* $Id: php_mysql.c,v 1.174.2.13 2003/05/28 16:18:14 rasmus Exp $ */ /* TODO: * @@ -315,7 +315,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_SYSTEM, OnUpdateInt, connect_timeout, 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_BOOLEAN("mysql.trace_mode", "0", PHP_INI_ALL, OnUpdateInt, trace_mode, zend_mysql_globals, mysql_globals) PHP_INI_END() /* }}} */

« previous php.cvs (#21299) next »